diff options
| author | Gregory Farnum <greg@gregs42.com> | 2013-04-08 15:53:30 -0700 |
|---|---|---|
| committer | Gregory Farnum <greg@gregs42.com> | 2013-04-08 15:53:30 -0700 |
| commit | 1a3890a59fd8504176fe987cd3b1401bf721aa3f (patch) | |
| tree | 80fb96236dc425a1b102b4018cac0cf65ed6c9d5 | |
| parent | 9c2d017d525a44b92db8addc3492011ebfffd6d0 (diff) | |
| parent | a30917746614275baeb718e902133f06ef44fba6 (diff) | |
| download | ceph-1a3890a59fd8504176fe987cd3b1401bf721aa3f.tar.gz | |
Merge pull request #202 from ceph/wip-log-boot
Fixes #4676.
Reviewed-by: Greg Farnum <greg@inktank.com>
| -rw-r--r-- | src/global/global_init.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/global/global_init.cc b/src/global/global_init.cc index 43ce0909565..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); @@ -148,6 +152,7 @@ void global_init_daemonize(CephContext *cct, int flags) return; // stop log thread + g_ceph_context->_log->flush(); g_ceph_context->_log->stop(); int ret = daemon(1, 1); |