From 9d224ab3ab1858ce272604e1eb1c393c81067b2b Mon Sep 17 00:00:00 2001 From: Ronen Friedman Date: Wed, 15 Jan 2025 01:38:43 -0600 Subject: [PATCH] common: modify md_config_cacher_t to implement get_tracked_keys() Modify the md_config_cacher_t to implement the new get_tracked_keys() callback, instead of the deprecated char* based get_tracked_conf_keys(). Signed-off-by: Ronen Friedman --- src/common/config_cacher.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/common/config_cacher.h b/src/common/config_cacher.h index f23195955a1..577aac442b6 100644 --- a/src/common/config_cacher.h +++ b/src/common/config_cacher.h @@ -31,28 +31,28 @@ template class md_config_cacher_t : public md_config_obs_t { ConfigProxy& conf; - const char* keys[2]; + const std::string option_name; std::atomic value_cache; - const char** get_tracked_conf_keys() const override { - return const_cast(keys); + std::vector get_tracked_keys() const noexcept override { + return std::vector{option_name}; } void handle_conf_change(const ConfigProxy& conf, const std::set& changed) override { - if (changed.contains(keys[0])) { - value_cache.store(conf.get_val(keys[0])); + if (changed.contains(option_name)) { + value_cache.store(conf.get_val(option_name)); } } public: md_config_cacher_t(ConfigProxy& conf, const char* const option_name) - : conf(conf), - keys{option_name, nullptr} { + : conf(conf) + , option_name{option_name} { conf.add_observer(this); std::atomic_init(&value_cache, - conf.get_val(keys[0])); + conf.get_val(option_name)); } ~md_config_cacher_t() { -- 2.39.5