From: Sage Weil <sage@inktank.com>
Date: Thu, 27 Mar 2014 18:36:42 +0000 (-0700)
Subject: ceph-conf: do not log
X-Git-Tag: v0.79~75^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=acc31e75a3e7115c00f9980609948455e3b2d49e;p=ceph.git

ceph-conf: do not log

If you are querying the conf for an osd and it has a log configured, we
should not generate any log activity.

This isn't super pretty, but it is much less intrusive that wiring a 'do
not log' flag down into CephContext and a zillion other places.

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..99de8b8cfcf1 100644
--- a/src/tools/ceph_conf.cc
+++ b/src/tools/ceph_conf.cc
@@ -158,6 +158,11 @@ int main(int argc, const char **argv)
   env_to_vec(args);
   vector<const char*> orig_args = args;
 
+  args.push_back("--log-file");
+  args.push_back("");
+  args.push_back("--no-log-to-stderr");
+  args.push_back("--no-log-to-syslog");
+
   global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, CODE_ENVIRONMENT_DAEMON,
 	      CINIT_FLAG_NO_DAEMON_ACTIONS);