From: Sage Weil <sage@inktank.com>
Date: Sun, 30 Mar 2014 04:52:09 +0000 (-0700)
Subject: ceph-conf: use global_pre_init to avoid starting logging
X-Git-Tag: v0.79~42^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fc1a424e837bee139726eec333c9efd65e2abb6a;p=ceph.git

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 <sage@inktank.com>
---

diff --git a/src/tools/ceph_conf.cc b/src/tools/ceph_conf.cc
index 14045f9f8574..09bbc561149f 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<const char*> 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