diff --git a/include/transport/Logging.h b/include/transport/Logging.h index d79fa8a50c9d41015ca8ec9e9ae5e7bd33c4b5ae..9b24c6e6d5ce740f5e076397b50e14ddf19c11ea 100644 --- a/include/transport/Logging.h +++ b/include/transport/Logging.h @@ -56,6 +56,7 @@ namespace Logging { void initBackendLogging(Config *config); void initMainLogging(Config *config); +void initManagerLogging(Config *config); void shutdownLogging(); void redirect_stderr(); diff --git a/libtransport/Logging.cpp b/libtransport/Logging.cpp index 36f5d5f12b7f3ea8e09514746f1e259524d299ce..44614034d5606f4c1fa1f242e4241cc2900f6e74 100644 --- a/libtransport/Logging.cpp +++ b/libtransport/Logging.cpp @@ -203,6 +203,9 @@ void initMainLogging(Config *config) { initLogging(config, "logging.config"); initLogging(config, "logging.backend_config", true); } +void initManagerLogging(Config *config) { + initLogging(config, "logging.config"); +} void redirect_stderr() { intercepter_cerr = new intercept_stream(std::cerr, "cerr"); diff --git a/spectrum_manager/src/managerconfig.cpp b/spectrum_manager/src/managerconfig.cpp index c25b1a04025c4f61b8373b1e6e188b0ed3387cd3..730850a1f89241e4f8b2ce17e4485abb6be7a332 100644 --- a/spectrum_manager/src/managerconfig.cpp +++ b/spectrum_manager/src/managerconfig.cpp @@ -42,6 +42,7 @@ bool ManagerConfig::load(const std::string &configfile, boost::program_options:: ("database.password", value()->default_value(""), "Database Password.") ("database.port", value()->default_value(0), "Database port.") ("database.prefix", value()->default_value(""), "Prefix of tables in database") + ("logging.config", value()->default_value("/etc/spectrum2/logging.cfg"), "Logging configuration file") ; store(parse_config_file(ifs, opts), m_variables); diff --git a/spectrum_manager/src/server.cpp b/spectrum_manager/src/server.cpp index 88ffc726ae8cf0ee3004fc930117dad9901db46b..7da6adf9fddc756d0234267a9ab42a2b9947a514 100644 --- a/spectrum_manager/src/server.cpp +++ b/spectrum_manager/src/server.cpp @@ -87,7 +87,8 @@ Server::Server(ManagerConfig *config, const std::string &config_file) { m_storageCfg = new Config(); m_storageCfg->load(config_file); - + + Logging::initManagerLogging(m_storageCfg); std::string error; m_storage = StorageBackend::createBackend(m_storageCfg, error); if (m_storage == NULL) { diff --git a/spectrum_manager/src/server.h b/spectrum_manager/src/server.h index f4fa17f9a12ab1f122c67b623ec24af14751545b..1cbf3f0ed2730f71d3c1c760ef4083f19d1d10b8 100644 --- a/spectrum_manager/src/server.h +++ b/spectrum_manager/src/server.h @@ -32,6 +32,7 @@ #include "managerconfig.h" #include "transport/Config.h" +#include "transport/Logging.h" #include "transport/SQLite3Backend.h" #include "transport/MySQLBackend.h" #include "transport/PQXXBackend.h"