From e7649daf2e0a65c78cbfd90f2266c1ada79f5e8a Mon Sep 17 00:00:00 2001 From: Johannes Wendel Date: Thu, 22 Aug 2019 21:23:31 +0200 Subject: [PATCH 1/2] added log --- FlippR-Driver/networking/FlippRServer.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/FlippR-Driver/networking/FlippRServer.cpp b/FlippR-Driver/networking/FlippRServer.cpp index 00140f4..62e9a04 100644 --- a/FlippR-Driver/networking/FlippRServer.cpp +++ b/FlippR-Driver/networking/FlippRServer.cpp @@ -191,7 +191,10 @@ TCPServer* FlippRServer::build_input_server() unsigned short port = (unsigned short) config().getInt("FlippRServer.port", this->output_port); std::string runtime_dir = this->get_runtime_dir(); + + SocketAddress address(runtime_dir + SOCKET_NAME); + logger().information("Input-Server address is set to: " + address.toString()); ServerSocket server_socket(address); return new TCPServer(new input::InputSocketHandlerFactory(this->input_driver), port); From 04d1f73b977a678c6a4022f8570a7a776be71027 Mon Sep 17 00:00:00 2001 From: Johannes Wendel Date: Thu, 22 Aug 2019 21:50:27 +0200 Subject: [PATCH 2/2] changed some stuff with directories --- FlippR-Driver/networking/FlippRServer.cpp | 22 ++++++++++++++++++---- FlippR-Driver/networking/FlippRServer.h | 2 ++ 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/FlippR-Driver/networking/FlippRServer.cpp b/FlippR-Driver/networking/FlippRServer.cpp index 62e9a04..a2fbfbe 100644 --- a/FlippR-Driver/networking/FlippRServer.cpp +++ b/FlippR-Driver/networking/FlippRServer.cpp @@ -18,6 +18,7 @@ #include #include #include +#include int main(int argc, char** argv) { @@ -36,6 +37,8 @@ using namespace Poco::Util; using namespace Poco::JSON; using namespace Poco; +namespace fs = std::experimental::filesystem; + FlippRServer::FlippRServer() : help_requested(false), input_port(9980), @@ -189,17 +192,28 @@ HTTPServer* FlippRServer::build_output_server() TCPServer* FlippRServer::build_input_server() { unsigned short port = (unsigned short) config().getInt("FlippRServer.port", this->output_port); + + SocketAddress address(path); - std::string runtime_dir = this->get_runtime_dir(); - - - SocketAddress address(runtime_dir + SOCKET_NAME); logger().information("Input-Server address is set to: " + address.toString()); ServerSocket server_socket(address); return new TCPServer(new input::InputSocketHandlerFactory(this->input_driver), port); } +std::string FlippRServer::create_directory(std::string file_name) +{ + std::string runtime_dir = this->get_runtime_dir(); + + fs::path path = runtime_dir + file_name; + if(!fs::exists(path)) + { + fs::create_directory(path); + } + + return path; +} + void FlippRServer::defineOptions(OptionSet& options) { ServerApplication::defineOptions(options); diff --git a/FlippR-Driver/networking/FlippRServer.h b/FlippR-Driver/networking/FlippRServer.h index fbc3641..abae6cf 100644 --- a/FlippR-Driver/networking/FlippRServer.h +++ b/FlippR-Driver/networking/FlippRServer.h @@ -34,6 +34,8 @@ public: private: void initialize_output_driver(); void initialize_input_driver(); + + std::string create_directory(std::string file_name); void parse_server_config_file(); std::string get_runtime_dir();