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

Improved controller shutdown speed

Browse source
This commit is contained in:
Thulinma 2017-01-01 23:20:49 +01:00
parent b27c25482a
commit 370418631c
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/controller/controller.cpp
View file

@ -383,12 +383,17 @@ int main_loop(int argc, char ** argv){
}//indentation intentionally wrong, to minimize Pro/nonPro diffs }//indentation intentionally wrong, to minimize Pro/nonPro diffs
/*LTS-END*/ /*LTS-END*/
//join all joinable threads //join all joinable threads
HIGH_MSG("Joining stats thread...");
statsThread.join(); statsThread.join();
HIGH_MSG("Joining monitor thread...");
monitorThread.join(); monitorThread.join();
/*LTS-START*/ /*LTS-START*/
HIGH_MSG("Joining uplink thread...");
uplinkThread.join(); uplinkThread.join();
HIGH_MSG("Joining push thread...");
pushThread.join(); pushThread.join();
#ifdef LICENSING #ifdef LICENSING
HIGH_MSG("Joining license thread...");
licenseThread.join(); licenseThread.join();
#endif #endif
/*LTS-END*/ /*LTS-END*/

2
src/controller/controller_license.cpp
View file

@ -183,7 +183,7 @@ namespace Controller{
now = Util::epoch(); now = Util::epoch();
} }
} }
Util::wait(2000);//wait at least 2 seconds Util::sleep(1000);//sleep a bit
} }
} }
} }