rhetenor/flippr-code
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/swinginbird/flippr-code

Browse Source
This commit is contained in:
Jonas Zeunert
2019-08-06 20:35:33 +02:00
parent e2499b055c 40ee54a1f8
commit fc15aa6a5e
7 changed files with 36 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
FlippR-Driver/networking/FlippRServer.cpp
View File

@@ -128,10 +128,10 @@ void FlippRServer::initialize_output_driver()
exit(EXIT_FAILURE);
}
this->output_driver = flippR_driver::get_OutputDriver(lamp_config_stream,
solenoid_config_stream,
sound_config_stream,
display_config_stream);
this->output_driver = flippR_driver::get_OutputDriver(solenoid_config_stream,
lamp_config_stream,
sound_config_stream,
display_config_stream);
}
void FlippRServer::initialize_input_driver()
@@ -155,10 +155,20 @@ void FlippRServer::initialize_input_driver()
int FlippRServer::main(const std::vector<std::string>& args)
{
if(!help_requested)
{
waitForTerminationRequest();
}
if(help_requested)
return Application::EXIT_OK;
std::unique_ptr<HTTPServer> output_server(this->build_output_server());
output_server->start();
std::unique_ptr<TCPServer> input_server(this->build_input_server());
logger().information("Server running!");
waitForTerminationRequest();
this->output_driver->deactivate_all_lamps();
this->output_driver->deactivate_displays();
output_server->stop();
return Application::EXIT_OK;
}