Skip to content

Commit 7c8f081

Browse files
committed
common: ceph_context: make use of get_tracked_keys()
modify some configuration object registrations in common/ceph_context to use the updated md_config_obs_t::get_tracked_keys() API Signed-off-by: Ronen Friedman <[email protected]>
1 parent 9d224ab commit 7c8f081

File tree

1 file changed

+24
-31
lines changed

1 file changed

+24
-31
lines changed

src/common/ceph_context.cc

Lines changed: 24 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,8 @@ class LockdepObs : public md_config_obs_t {
120120
}
121121
}
122122

123-
const char** get_tracked_conf_keys() const override {
124-
static const char *KEYS[] = {"lockdep", NULL};
125-
return KEYS;
123+
std::vector<std::string> get_tracked_keys() const noexcept override {
124+
return {"lockdep"s};
126125
}
127126

128127
void handle_conf_change(const ConfigProxy& conf,
@@ -164,12 +163,8 @@ class MempoolObs : public md_config_obs_t,
164163
}
165164

166165
// md_config_obs_t
167-
const char** get_tracked_conf_keys() const override {
168-
static const char *KEYS[] = {
169-
"mempool_debug",
170-
NULL
171-
};
172-
return KEYS;
166+
std::vector<std::string> get_tracked_keys() const noexcept override {
167+
return {"mempool_debug"s};
173168
}
174169

175170
void handle_conf_change(const ConfigProxy& conf,
@@ -278,29 +273,27 @@ class LogObs : public md_config_obs_t {
278273
: log(l), lock(ceph::make_mutex("log_obs")) {
279274
}
280275

281-
const char** get_tracked_conf_keys() const override {
282-
static const char *KEYS[] = {
283-
"log_file",
284-
"log_max_new",
285-
"log_max_recent",
286-
"log_to_file",
287-
"log_to_syslog",
288-
"err_to_syslog",
289-
"log_stderr_prefix",
290-
"log_to_stderr",
291-
"err_to_stderr",
292-
"log_to_graylog",
293-
"err_to_graylog",
294-
"log_graylog_host",
295-
"log_graylog_port",
296-
"log_to_journald",
297-
"err_to_journald",
298-
"log_coarse_timestamps",
299-
"fsid",
300-
"host",
301-
NULL
276+
std::vector<std::string> get_tracked_keys() const noexcept override {
277+
return std::vector<std::string>{
278+
"log_file"s,
279+
"log_max_new"s,
280+
"log_max_recent"s,
281+
"log_to_file"s,
282+
"log_to_syslog"s,
283+
"err_to_syslog"s,
284+
"log_stderr_prefix"s,
285+
"log_to_stderr"s,
286+
"err_to_stderr"s,
287+
"log_to_graylog"s,
288+
"err_to_graylog"s,
289+
"log_graylog_host"s,
290+
"log_graylog_port"s,
291+
"log_to_journald"s,
292+
"err_to_journald"s,
293+
"log_coarse_timestamps"s,
294+
"fsid"s,
295+
"host"s
302296
};
303-
return KEYS;
304297
}
305298

306299
void handle_conf_change(const ConfigProxy& conf,

0 commit comments

Comments
 (0)