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 2017-07-28 13:25:22 +02:00
commit 5e7627705a
1 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/controller/controller.cpp
View file

@ -1,8 +1,10 @@
/// \file controller.cpp
/// Contains all code for the controller executable.
#include "controller_api.h"
#include "controller_capabilities.h"
#include "controller_connectors.h"
#include "controller_push.h"
#include "controller_statistics.h"
#include "controller_storage.h"
#include "controller_streams.h"
@ -29,8 +31,6 @@
#include "controller_uplink.h"
#include <mist/triggers.h>
/*LTS-END*/
#include "controller_api.h"
#include "controller_push.h"
#ifndef COMPILED_USERNAME
#define COMPILED_USERNAME ""
@ -138,13 +138,6 @@ static unsigned long mix(unsigned long a, unsigned long b, unsigned long c){
}
///\brief The main loop for the controller.
///
/// \triggers
/// The `"SYSTEM_STOP"` trigger is global, and is ran when the controller shuts down. If cancelled,
/// the controller does not shut down and will attempt to re-open the API socket. Its payload is:
/// ~~~~~~~~~~~~~~~
/// shutdown reason
/// ~~~~~~~~~~~~~~~
int main_loop(int argc, char **argv){
Controller::isTerminal = Controller::isColorized = isatty(fileno(stdin));
Controller::Storage = JSON::fromFile("config.json");
@ -439,7 +432,7 @@ int main_loop(int argc, char **argv){
#endif
// start main loop
while (Controller::conf.is_active){/*LTS*/
while (Controller::conf.is_active){
Controller::conf.serveThreadedSocket(Controller::handleAPIConnection);
// print shutdown reason
std::string shutdown_reason;
@ -468,8 +461,8 @@ int main_loop(int argc, char **argv){
Controller::Log("CONF", "Controller shutting down because of " + shutdown_reason);
/*LTS-START*/
}
}// indentation intentionally wrong, to minimize Pro/nonPro diffs
/*LTS-END*/
/*LTS-END*/
}
// join all joinable threads
HIGH_MSG("Joining stats thread...");
statsThread.join();