diff options
| -rw-r--r-- | server/docs/udm.conf.sample | 1 | ||||
| -rw-r--r-- | server/src/main.cpp | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/server/docs/udm.conf.sample b/server/docs/udm.conf.sample index 6b5b031..0739aa5 100644 --- a/server/docs/udm.conf.sample +++ b/server/docs/udm.conf.sample @@ -2,6 +2,7 @@ server ;section for core server settings { + ;port 6613; server port ;default_download_directory ~/udm_downloads ; default directory to store downloads ;default_metadata_module flat_files_metadata ; first loaded metadata module used by default if not set ;default_data_storage_module <not set> ; first loaded data_storage module used by default if not set diff --git a/server/src/main.cpp b/server/src/main.cpp index efbd92b..3d3d0c4 100644 --- a/server/src/main.cpp +++ b/server/src/main.cpp @@ -166,8 +166,8 @@ int main(int argc, char *argv[]) } boost::asio::io_service io_service_server; try{ - //TODO: server options (ssl, ...) - serv = new server(io_service_server, 6613); + //TODO: server options ip address, interface name + serv = new server(io_service_server, runtime_config.config_file.get<int>("server.port", 6613)); } catch(std::exception &e) { @@ -177,6 +177,7 @@ int main(int argc, char *argv[]) { //TODO: } + //TODO: run in separate thread boost::system::error_code ec; io_service_server.run(ec); if(ec) |