diff --git a/application.cpp b/application.cpp index aa9e10f82..f0960696e 100644 --- a/application.cpp +++ b/application.cpp @@ -106,15 +106,6 @@ bool application::initialize_impl(int argc, char** argv, vector(); - if( logconf.is_relative() ) - logconf = bfs::current_path() / logconf; - } - my->_logging_conf = logconf; - bfs::path data_dir = "data-dir"; if( options.count("data-dir") ) { @@ -124,6 +115,15 @@ bool application::initialize_impl(int argc, char** argv, vector_data_dir = data_dir; + bfs::path logconf = data_dir / "logging.json"; + if( options.count("logconf") ) + { + logconf = options["logconf"].as(); + if( logconf.is_relative() ) + logconf = data_dir / logconf; + } + my->_logging_conf = logconf; + bfs::path config_file_name = data_dir / "config.ini"; if( options.count( "config" ) ) { auto config_file_name = options["config"].as();