From: Sage Weil <sage@redhat.com>
Date: Wed, 26 Jul 2017 02:20:06 +0000 (-0400)
Subject: common/common_init: disable default dout logging for UTILITY_NODOUT too
X-Git-Tag: v12.1.2~94^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dfab9d9b5d75d0f87053b1a3727f62da72af6c91;p=ceph.git

common/common_init: disable default dout logging for UTILITY_NODOUT too

This was broken in 4d06719f101f49019be25bd6137f72f2cb85bd5a.

Fixes: http://tracker.ceph.com/issues/20771
Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/common/common_init.cc b/src/common/common_init.cc
index b74633cf9487..9cb1b1207fdb 100644
--- a/src/common/common_init.cc
+++ b/src/common/common_init.cc
@@ -52,7 +52,8 @@ CephContext *common_preinit(const CephInitParameters &iparams,
     conf->set_val("keyring", "$osd_data/keyring", false);
   }
 
-  if (code_env == CODE_ENVIRONMENT_LIBRARY) {
+  if (code_env == CODE_ENVIRONMENT_LIBRARY ||
+      code_env == CODE_ENVIRONMENT_UTILITY_NODOUT) {
     conf->set_val_or_die("log_to_stderr", "false");
     conf->set_val_or_die("err_to_stderr", "false");
     conf->set_val_or_die("log_flush_on_exit", "false");