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

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

Browse Source
This commit is contained in:
Johannes Wendel
2019-07-12 08:43:02 +02:00
parent b9bffd493d 29427cc394
commit bb6814148d
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -170,9 +170,8 @@ int FlippRServer::main(const std::vector<std::string>& args)
HTTPServer* FlippRServer::build_output_server() HTTPServer* FlippRServer::build_output_server()
{ {
unsigned short port = (unsigned short) config().getInt("HTTPTimeServer.port", this->output_port); unsigned short port = (unsigned short) config().getInt("FlippRServer.port", this->output_port);
// todo XDG_RUNTIME_DIR
std::string runtime_dir = this->get_runtime_dir(); std::string runtime_dir = this->get_runtime_dir();
SocketAddress address(runtime_dir + SOCKET_NAME); SocketAddress address(runtime_dir + SOCKET_NAME);
@@ -183,9 +182,8 @@ HTTPServer* FlippRServer::build_output_server()
TCPServer* FlippRServer::build_input_server() TCPServer* FlippRServer::build_input_server()
{ {
unsigned short port = (unsigned short) config().getInt("HTTPTimeServer.port", this->output_port); unsigned short port = (unsigned short) config().getInt("FlippRServer.port", this->output_port);
//TODO adapt path
std::string runtime_dir = this->get_runtime_dir(); std::string runtime_dir = this->get_runtime_dir();
SocketAddress address(runtime_dir + SOCKET_NAME); SocketAddress address(runtime_dir + SOCKET_NAME);
ServerSocket server_socket(address); ServerSocket server_socket(address);