From d968dd35ed29a8bd3d93d108129c882e29d09c39 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Thu, 6 Aug 2020 16:08:40 +0800 Subject: [PATCH] crimson/common: move ConfigProxy::parse_config_files() into .cc prepare for a proper async version, which will be a little bit more complicated than the existing one, so better off moving it into .cc file. Signed-off-by: Kefu Chai --- src/crimson/common/config_proxy.cc | 13 +++++++++++++ src/crimson/common/config_proxy.h | 12 +----------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/crimson/common/config_proxy.cc b/src/crimson/common/config_proxy.cc index 18c891f6875..39d6842d78b 100644 --- a/src/crimson/common/config_proxy.cc +++ b/src/crimson/common/config_proxy.cc @@ -46,5 +46,18 @@ void ConfigProxy::show_config(ceph::Formatter* f) const { get_config().show_config(*values, f); } +seastar::future<> ConfigProxy::parse_config_files(const std::string& conf_files) +{ + return do_change([this, conf_files](ConfigValues& values) { + const char* conf_file_paths = + conf_files.empty() ? nullptr : conf_files.c_str(); + get_config().parse_config_files(values, + obs_mgr, + conf_file_paths, + &std::cerr, + CODE_ENVIRONMENT_DAEMON); + }); +} + ConfigProxy::ShardedConfig ConfigProxy::sharded_conf; } diff --git a/src/crimson/common/config_proxy.h b/src/crimson/common/config_proxy.h index 29f5984b552..f50a6343188 100644 --- a/src/crimson/common/config_proxy.h +++ b/src/crimson/common/config_proxy.h @@ -179,17 +179,7 @@ public: }); } - seastar::future<> parse_config_files(const std::string& conf_files) { - return do_change([this, conf_files](ConfigValues& values) { - const char* conf_file_paths = - conf_files.empty() ? nullptr : conf_files.c_str(); - get_config().parse_config_files(values, - obs_mgr, - conf_file_paths, - &std::cerr, - CODE_ENVIRONMENT_DAEMON); - }); - } + seastar::future<> parse_config_files(const std::string& conf_files); using ShardedConfig = seastar::sharded; -- 2.47.3