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:
#	CMakeLists.txt
#	src/controller/controller.cpp
#	src/controller/controller_api.cpp
This commit is contained in:
Thulinma 2019-09-09 13:41:22 +02:00
commit 919e5eb41f
1 changed files with 4 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

@ -436,12 +436,12 @@ int main_loop(int argc, char **argv){
tthread::thread statsThread(Controller::SharedMemStats, &Controller::conf); tthread::thread statsThread(Controller::SharedMemStats, &Controller::conf);
// start monitoring thread // start monitoring thread
tthread::thread monitorThread(statusMonitor, 0); tthread::thread monitorThread(statusMonitor, 0);
// start UDP API thread
tthread::thread UDPAPIThread(Controller::handleUDPAPI, 0);
// start monitoring thread /*LTS*/ // start monitoring thread /*LTS*/
tthread::thread uplinkThread(Controller::uplinkConnection, 0); /*LTS*/ tthread::thread uplinkThread(Controller::uplinkConnection, 0); /*LTS*/
// start push checking thread // start push checking thread
tthread::thread pushThread(Controller::pushCheckLoop, 0); tthread::thread pushThread(Controller::pushCheckLoop, 0);
// start UDP API thread
tthread::thread UDPAPIThread(Controller::handleUDPAPI, 0);
#ifdef UPDATER #ifdef UPDATER
// start updater thread // start updater thread
tthread::thread updaterThread(Controller::updateThread, 0); tthread::thread updaterThread(Controller::updateThread, 0);
@ -484,13 +484,13 @@ int main_loop(int argc, char **argv){
statsThread.join(); statsThread.join();
HIGH_MSG("Joining monitor thread..."); HIGH_MSG("Joining monitor thread...");
monitorThread.join(); monitorThread.join();
HIGH_MSG("Joining UDP API thread...");
UDPAPIThread.join();
/*LTS-START*/ /*LTS-START*/
HIGH_MSG("Joining uplink thread..."); HIGH_MSG("Joining uplink thread...");
uplinkThread.join(); uplinkThread.join();
HIGH_MSG("Joining push thread..."); HIGH_MSG("Joining push thread...");
pushThread.join(); pushThread.join();
HIGH_MSG("Joining UDP API thread...");
UDPAPIThread.join();
#ifdef LICENSING #ifdef LICENSING
HIGH_MSG("Joining license thread..."); HIGH_MSG("Joining license thread...");
licenseThread.join(); licenseThread.join();