From fc1a424e837bee139726eec333c9efd65e2abb6a Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Sat, 29 Mar 2014 21:52:09 -0700 Subject: [PATCH] ceph-conf: use global_pre_init to avoid starting logging This avoids starting up logging, which is not appropriate when we are examining the config state and not actually starting up the entity in question. Fixes: #7849 Signed-off-by: Sage Weil --- src/tools/ceph_conf.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tools/ceph_conf.cc b/src/tools/ceph_conf.cc index 14045f9f85744..09bbc561149f2 100644 --- a/src/tools/ceph_conf.cc +++ b/src/tools/ceph_conf.cc @@ -158,8 +158,8 @@ int main(int argc, const char **argv) env_to_vec(args); vector orig_args = args; - global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, CODE_ENVIRONMENT_DAEMON, - CINIT_FLAG_NO_DAEMON_ACTIONS); + global_pre_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, CODE_ENVIRONMENT_DAEMON, + CINIT_FLAG_NO_DAEMON_ACTIONS); // do not common_init_finish(); do not start threads; do not do any of thing // wonky things the daemon whose conf we are examining would do (like initialize -- 2.39.5