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

Fixed SYSTEM_START trigger ignoring return value

Browse source
This commit is contained in:
Thulinma 2019-02-28 11:27:47 +01:00
parent 132aea4536
commit f38c838cfd
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/controller/controller.cpp
View file

@ -302,6 +302,7 @@ int main_loop(int argc, char **argv){
Controller::prometheus = Controller::Storage["config"]["prometheus"].asStringRef(); Controller::prometheus = Controller::Storage["config"]["prometheus"].asStringRef();
Controller::accesslog = Controller::Storage["config"]["accesslog"].asStringRef(); Controller::accesslog = Controller::Storage["config"]["accesslog"].asStringRef();
Controller::writeConfig(); Controller::writeConfig();
if (!Controller::conf.is_active){return 0;}
Controller::checkAvailProtocols(); Controller::checkAvailProtocols();
Controller::checkAvailTriggers(); Controller::checkAvailTriggers();
Controller::writeCapabilities(); Controller::writeCapabilities();

5
src/controller/controller_storage.cpp
View file

@ -422,7 +422,10 @@ namespace Controller{
static bool serverStartTriggered; static bool serverStartTriggered;
if (!serverStartTriggered){ if (!serverStartTriggered){
if (!Triggers::doTrigger("SYSTEM_START")){conf.is_active = false;} if (!Triggers::doTrigger("SYSTEM_START")){
INFO_MSG("Shutting down because of SYSTEM_START trigger response");
conf.is_active = false;
}
serverStartTriggered = true; serverStartTriggered = true;
} }
/*LTS-END*/ /*LTS-END*/