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_statistics.cpp
This commit is contained in:
Thulinma 2016-09-22 09:16:34 +02:00
commit 497583e54b
3 changed files with 26 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/controller/controller_statistics.cpp
View file

@ -207,10 +207,15 @@ void Controller::SharedMemStats(void * config){
Util::wait(1000);
}
statPointer = 0;
DEBUG_MSG(DLVL_HIGH, "Stopping stats thread");
if (Controller::killOnExit){
DEBUG_MSG(DLVL_WARN, "Killing all connected clients to force full shutdown");
statServer.finishEach();
HIGH_MSG("Stopping stats thread");
if (Controller::restarting){
statServer.abandon();
}else{/*LTS-START*/
if (Controller::killOnExit){
DEBUG_MSG(DLVL_WARN, "Killing all connected clients to force full shutdown");
statServer.finishEach();
}
/*LTS-END*/
}
}