From 704bf55df5fae51bf0e8d86679ee7f34e22553d2 Mon Sep 17 00:00:00 2001 From: Gluzskiy Alexandr Date: Sun, 9 Aug 2015 08:16:50 +0300 Subject: client-qt: socket wraper to work with both ssl and plain connection server: socket wraper to work with both ssl and plain connection bit of config related changes ssl support (untested) --- server/src/main.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'server/src/main.cpp') diff --git a/server/src/main.cpp b/server/src/main.cpp index a876b42..efbd92b 100644 --- a/server/src/main.cpp +++ b/server/src/main.cpp @@ -27,7 +27,7 @@ #include "utilities.h" #include "server.h" #include "main.h" - +#include "config.h" core_api *module_api = nullptr; @@ -76,9 +76,13 @@ int main(int argc, char *argv[]) else std::cerr<<"failed to load config: \"" + config_path + "\", file does not exists or is not regular file\n"; } + //load all config variables here + runtime_config.settings.verbosity = runtime_config.config_file.get("server.verbosity", 0); + daemon = runtime_config.config_file.get("server.daemon", false); + //override config from command line here if(vm.count("verbosity")) { - runtime_config.verbosity = vm["verbosity"].as(); + runtime_config.settings.verbosity = vm["verbosity"].as(); } if(vm.count("help")) @@ -129,7 +133,7 @@ int main(int argc, char *argv[]) modules->load_modules(); } - std::string default_metadata_module_name = runtime_config.config_file.get("default_metadata_module", ""); + std::string default_metadata_module_name = runtime_config.config_file.get("server.default_metadata_module", ""); if(default_metadata_module_name == "") { if(!modules->get_metadata_modules().empty()) -- cgit v1.2.3