From: Sage Weil <sage@redhat.com>
Date: Fri, 22 Mar 2019 15:58:30 +0000 (-0500)
Subject: log,global: do not start flusher thread until after we have our mon config
X-Git-Tag: v15.0.0~40^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=cd6a5b9c40779956629803f222c365bdb291a169;p=ceph-ci.git

log,global: do not start flusher thread until after we have our mon config

We want to respect the settings in the mon config that affect logging before
we enable the flusher thread.  That allows us to set (via the monitor) things
like log_to_file=false or log_to_syslog=true.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/common/ceph_context.cc b/src/common/ceph_context.cc
index 8ea3e223629..3d70344d212 100644
--- a/src/common/ceph_context.cc
+++ b/src/common/ceph_context.cc
@@ -635,7 +635,6 @@ CephContext::CephContext(uint32_t module_type_,
     crush_location(this)
 {
   _log = new ceph::logging::Log(&_conf->subsys);
-  _log->start();
 
   _log_obs = new LogObs(_log);
   _conf.add_observer(_log_obs);
diff --git a/src/global/global_init.cc b/src/global/global_init.cc
index 399a1f6541f..abce4c05529 100644
--- a/src/global/global_init.cc
+++ b/src/global/global_init.cc
@@ -154,7 +154,7 @@ void global_pre_init(
       _exit(1);
     }
   }
-
+  cct->_log->start();
   // do the --show-config[-val], if present in argv
   conf.do_argv_commands();