summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2013-04-07 09:06:23 -0700
committerSage Weil <sage@inktank.com>2013-04-07 09:07:21 -0700
commita30917746614275baeb718e902133f06ef44fba6 (patch)
tree36d92c46f946d94c427672fbf28d31846e187f30
parent1e7ddd9e9fb4ce97a1b17bb5fa52611132353490 (diff)
downloadceph-a30917746614275baeb718e902133f06ef44fba6.tar.gz
global: call config observers on global_init (and start logging!)
Currently we don't start logging on daemon startup unless the log_file parameter was adjusted by ceph.conf. Instead, we should call all config observers so that the logging subsystem is fully configured and we log even prior to the daemonize and common_init_finish (when we call observers again). This fixes logging for the initial period before we daemonize. For some of the daemons (osd, mon), this includes significant work. It also fixes the problem where users don't see the 'ceph version ...' banner on daemon start. Backport: bobtail Signed-off-by: Sage Weil <sage@inktank.com>
-rw-r--r--src/global/global_init.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/global/global_init.cc b/src/global/global_init.cc
index 0f7179c39df..9a77e734801 100644
--- a/src/global/global_init.cc
+++ b/src/global/global_init.cc
@@ -106,6 +106,10 @@ void global_init(std::vector < const char * > *alt_def_args, std::vector < const
g_lockdep = cct->_conf->lockdep;
+ // call all observers now. this has the side-effect of configuring
+ // and opening the log file immediately.
+ conf->call_all_observers();
+
// Now we're ready to complain about config file parse errors
complain_about_parse_errors(cct, &parse_errors);