From e831cbdc17b1f2e72fa9220bea106944121e89b2 Mon Sep 17 00:00:00 2001
From: Jonas Zeunert <zeunert@rhrk.uni-kl.de>
Date: Tue, 6 Aug 2019 20:52:49 +0200
Subject: [PATCH] bugfixing

---
 FlippR-Driver/networking/FlippRServer.cpp | 25 ++++++++---------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/FlippR-Driver/networking/FlippRServer.cpp b/FlippR-Driver/networking/FlippRServer.cpp
index 8f176d1..9bfd7eb 100644
--- a/FlippR-Driver/networking/FlippRServer.cpp
+++ b/FlippR-Driver/networking/FlippRServer.cpp
@@ -38,9 +38,7 @@ FlippRServer::FlippRServer() :
   help_requested(false),
   input_port(9980),
   output_port(9981)
-{
-  this->parse_server_config_file();
-}
+{}
 
 void FlippRServer::parse_server_config_file()
 {
@@ -93,6 +91,7 @@ void FlippRServer::uninitialize()
  */
 void FlippRServer::initialize(Application &self)
 {
+  this->parse_server_config_file();
   //Todo May restructure with subsystems
   //make this one application and subsystems ServerApplications
 
@@ -155,21 +154,13 @@ void FlippRServer::initialize_input_driver()
 
 int FlippRServer::main(const std::vector<std::string>& args)
 {
-  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();
+  if(!help_requested)
+  {
+    logger().information("Server running!");
+    waitForTerminationRequest();
+  }
   return Application::EXIT_OK;
+
 }
 
 HTTPServer* FlippRServer::build_output_server()