]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
common/common_init: disable default dout logging for UTILITY_NODOUT too 16578/head
authorSage Weil <sage@redhat.com>
Wed, 26 Jul 2017 02:20:06 +0000 (22:20 -0400)
committerSage Weil <sage@redhat.com>
Wed, 26 Jul 2017 02:20:06 +0000 (22:20 -0400)
This was broken in 4d06719f101f49019be25bd6137f72f2cb85bd5a.

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

index b74633cf94879eb24be62acb450a9566bd54c256..9cb1b1207fdb9ff1403aa0ec8564a393e6937269 100644 (file)
@@ -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");