Added central control of threading.
This commit is contained in:
1 parent
ef3b39361a
commit
2769de6f7e
25 files changed
+259
-110
No files matched your search
@@ -9,6 +9,7 @@
|
||||
#include "lib/utils/file_utils.h"
|
||||
#include "lib/utils/Dispatcher.h"
|
||||
#include "lib/config/protos/system.pb.h"
|
||||
#include "lib/utils/thread_manager.h"
|
||||
|
||||
#include <google/protobuf/text_format.h>
|
||||
#include <google/protobuf/io/zero_copy_stream_impl.h>
|
||||
@@ -86,8 +87,8 @@ Filter get_filter (LoggingConfig &cfg,
|
||||
}
|
||||
|
||||
void configure_logging(LoggingConfig const&cfg) {_default_logger_hub.config(cfg);}
|
||||
|
||||
void configure_logging(bts::config::Logging const&cfg)
|
||||
void configure_logging(bts::config::Logging const&cfg) {configure_logging(cfg,bts::config::ThreadGroupCfg ());}
|
||||
void configure_logging(bts::config::Logging const&cfg, bts::config::ThreadGroupCfg const&thread_cfg)
|
||||
{
|
||||
LoggingConfig real_cfg;
|
||||
real_cfg.deployment_type = config::get<config::DeploymentType>().type();
|
||||
@@ -124,6 +125,7 @@ void configure_logging(bts::config::Logging const&cfg)
|
||||
std::make_pair (syslog_sink(real_cfg),get_filter(real_cfg,cfg.syslog()));
|
||||
real_cfg.sinks["file"] =
|
||||
std::make_pair (file_sink(real_cfg),get_filter(real_cfg,cfg.file()));
|
||||
real_cfg.thread_cfg = thread_cfg;
|
||||
configure_logging(real_cfg);
|
||||
}
|
||||
|
||||
@@ -136,19 +138,20 @@ boost::filesystem::path log_cache_file_path ()
|
||||
return result;
|
||||
}
|
||||
|
||||
LoggingConfigPoller::LoggingConfigPoller (bts::config::Logging const&cfg)
|
||||
LoggingConfigPoller::LoggingConfigPoller (bts::config::Logging const&cfg, bts::config::ThreadGroupCfg const&thread_cfg)
|
||||
: _poller(utils::Dispatcher::background(), 1000, [=]() { poll_once(); }),
|
||||
_last_ts(std::time(nullptr)),
|
||||
_log_cache_file(log_cache_file_path()),
|
||||
_done(false)
|
||||
{
|
||||
init(cfg);
|
||||
init(cfg,thread_cfg);
|
||||
}
|
||||
|
||||
LoggingConfigPoller::LoggingConfigPoller () : LoggingConfigPoller(config::get<config::Logging>())
|
||||
LoggingConfigPoller::LoggingConfigPoller () : LoggingConfigPoller(config::get<config::Logging>(),
|
||||
threading::get_thread_cfg("logger"))
|
||||
{ }
|
||||
|
||||
void LoggingConfigPoller::init (bts::config::Logging const&cfg)
|
||||
void LoggingConfigPoller::init (bts::config::Logging const&cfg,bts::config::ThreadGroupCfg const&thread_cfg)
|
||||
{
|
||||
auto parent = _log_cache_file.parent_path();
|
||||
if (!boost::filesystem::is_directory(parent))
|
||||
@@ -160,7 +163,7 @@ void LoggingConfigPoller::init (bts::config::Logging const&cfg)
|
||||
|
||||
|
||||
// initialize logging
|
||||
configure_logging(cfg);
|
||||
configure_logging(cfg,thread_cfg);
|
||||
_poller.start();
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user