hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'development' into LTS_development

Browse source 
# Conflicts:
#	src/controller/controller.cpp
This commit is contained in:
Thulinma 2015-06-18 16:07:30 +02:00
commit cd74fd1e46
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/controller/controller.cpp
View file

@ -302,10 +302,6 @@ int main(int argc, char ** argv){
statsThread.join(); statsThread.join();
monitorThread.join(); monitorThread.join();
uplinkThread.join();/*LTS*/ uplinkThread.join();/*LTS*/
//give everything some time to print messages
Util::wait(100);
//close stderr to make the stderr reading thread exit
close(STDERR_FILENO);
//write config //write config
tthread::lock_guard<tthread::mutex> guard(Controller::logMutex); tthread::lock_guard<tthread::mutex> guard(Controller::logMutex);
Controller::Storage.removeMember("log"); Controller::Storage.removeMember("log");
@ -320,6 +316,10 @@ int main(int argc, char ** argv){
} }
//stop all child processes //stop all child processes
Util::Procs::StopAll(); Util::Procs::StopAll();
//give everything some time to print messages
Util::wait(100);
//close stderr to make the stderr reading thread exit
close(STDERR_FILENO);
std::cout << "Killed all processes, wrote config to disk. Exiting." << std::endl; std::cout << "Killed all processes, wrote config to disk. Exiting." << std::endl;
/*LTS-START*/ /*LTS-START*/
if (Controller::restarting){ if (Controller::restarting){

2
src/output/output_http.cpp
View file

@ -41,6 +41,7 @@ namespace Mist {
bool isMatch(const std::string & url, const std::string & m, std::string & streamname){ bool isMatch(const std::string & url, const std::string & m, std::string & streamname){
size_t found = m.find('$'); size_t found = m.find('$');
if (found != std::string::npos){ if (found != std::string::npos){
if (url.size() < m.size()){return false;}
if (m.substr(0, found) == url.substr(0, found) && m.substr(found+1) == url.substr(url.size() - (m.size() - found) + 1)){ if (m.substr(0, found) == url.substr(0, found) && m.substr(found+1) == url.substr(url.size() - (m.size() - found) + 1)){
streamname = url.substr(found, url.size() - m.size() + 1); streamname = url.substr(found, url.size() - m.size() + 1);
return true; return true;
@ -52,6 +53,7 @@ namespace Mist {
bool isPrefix(const std::string & url, const std::string & m, std::string & streamname){ bool isPrefix(const std::string & url, const std::string & m, std::string & streamname){
size_t found = m.find('$'); size_t found = m.find('$');
if (found != std::string::npos){ if (found != std::string::npos){
if (url.size() < m.size()){return false;}
size_t found_suf = url.find(m.substr(found+1), found); size_t found_suf = url.find(m.substr(found+1), found);
if (m.substr(0, found) == url.substr(0, found) && found_suf != std::string::npos){ if (m.substr(0, found) == url.substr(0, found) && found_suf != std::string::npos){
streamname = url.substr(found, found_suf - found); streamname = url.substr(found, found_suf - found);