From 26f198d32e843f317258573ae621fb8eaab7eb7f Mon Sep 17 00:00:00 2001
From: Johannes Wendel <j_wendel14@cs.uni-kl.de>
Date: Mon, 24 Jun 2019 12:28:33 +0200
Subject: [PATCH] added server config file

---
 .../json_example/output/Output_Pin_Config.json  |  5 +++--
 .../contrib/json_example/server_config.json     | 10 ++++++++++
 FlippR-Driver/networking/CMakeLists.txt         |  2 +-
 FlippR-Driver/networking/FlippRServer.cpp       | 17 +++++++++++++----
 4 files changed, 27 insertions(+), 7 deletions(-)
 create mode 100644 FlippR-Driver/contrib/json_example/server_config.json

diff --git a/FlippR-Driver/contrib/json_example/output/Output_Pin_Config.json b/FlippR-Driver/contrib/json_example/output/Output_Pin_Config.json
index bae61e5..fd27a8d 100644
--- a/FlippR-Driver/contrib/json_example/output/Output_Pin_Config.json
+++ b/FlippR-Driver/contrib/json_example/output/Output_Pin_Config.json
@@ -25,7 +25,8 @@
     "run" : 0
   },
   "driver_board" :
-  { // todo new layout!
+  { 
+    "todo": "new layout!",
     "i2c_address" : 32,
     "pin_base" : 65,
     "pin-select" :
@@ -63,4 +64,4 @@
     }
   }
 
-}
\ No newline at end of file
+}
diff --git a/FlippR-Driver/contrib/json_example/server_config.json b/FlippR-Driver/contrib/json_example/server_config.json
new file mode 100644
index 0000000..091721b
--- /dev/null
+++ b/FlippR-Driver/contrib/json_example/server_config.json
@@ -0,0 +1,10 @@
+{
+    "input-config"      :"../../contrib/json_example/input/Input_Pin_Config.json",
+    "matrix-config"     :"../../contrib/json_example/input/Input_Matrix_Config.json",
+    "output-pin-config" :"../../contrib/json_example/output/Output_Pin_Config.json",
+    "lamp-config"       :"../../contrib/json_example/output/Lamp_Config.json",
+    "solenoid-config"   :"../../contrib/json_example/output/Solenoid_Config.json",
+    "sound-config"      :"../../contrib/json_example/output/Sound_Config.json",
+    "display-config"    :"../../contrib/json_example/output/Display_Config.json",
+    "lamp-config"       :"../../contrib/json_example/output/Lamp_Config.json"
+}
diff --git a/FlippR-Driver/networking/CMakeLists.txt b/FlippR-Driver/networking/CMakeLists.txt
index 9ecf10f..b06a041 100644
--- a/FlippR-Driver/networking/CMakeLists.txt
+++ b/FlippR-Driver/networking/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.6.2)
 project(flippR_driver_networking)
 
-set(EXECUTABLE_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/${OUTPUT_PATH}/cli)
+set(EXECUTABLE_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/cli/networking)
 set(SOURCES
         input/InputSocketHandler.cpp
         output/OutputRequestHandler.cpp
diff --git a/FlippR-Driver/networking/FlippRServer.cpp b/FlippR-Driver/networking/FlippRServer.cpp
index 592fe63..112b405 100644
--- a/FlippR-Driver/networking/FlippRServer.cpp
+++ b/FlippR-Driver/networking/FlippRServer.cpp
@@ -58,8 +58,7 @@ void FlippRServer::parse_server_config_file()
 
   try
   {
-    config.open("server_config.json");
-    json = parser.parse(config).extract<Object::Ptr>();
+    config.open("./server_config.json");
   }
   catch(const std::exception e)
   {
@@ -67,6 +66,16 @@ void FlippRServer::parse_server_config_file()
     return;
   }
 
+  try
+  {
+    json = parser.parse(config).extract<Object::Ptr>();
+  }
+  catch(const std::exception e)
+  {
+    logger().information(FRED("server_config.json not readable!"));
+    return;
+  }
+
   logger().information(FCYN("Parsing server_config.json..."));
 
   for(auto &config_json : json->getNames())
@@ -164,7 +173,7 @@ HTTPServer* FlippRServer::build_output_server()
   unsigned short port = (unsigned short) config().getInt("HTTPTimeServer.port", this->output_port);
 
   // todo XDG_RUNTIME_DIR
-  SocketAddress address("/tmp/flippR_driver/S.flippR_driver");
+  SocketAddress address;
   ServerSocket server_socket(address);
 
   return new HTTPServer(new OutputRequestHandlerFactory(this->output_driver), server_socket, new HTTPServerParams);
@@ -175,7 +184,7 @@ TCPServer* FlippRServer::build_input_server()
   unsigned short port = (unsigned short) config().getInt("HTTPTimeServer.port", this->output_port);
 
   //TODO adapt path
-  SocketAddress address("/tmp/flippR_driver/S.flippR_driver");
+  SocketAddress address;
   ServerSocket server_socket(address);
 
   return new TCPServer(new input::InputSocketHandlerFactory(this->input_driver), port);