summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Farnum <greg@inktank.com>2013-04-08 18:20:53 -0700
committerGreg Farnum <greg@inktank.com>2013-04-08 18:20:53 -0700
commit88ab8413de212f0751a679299e174f511c937f9b (patch)
treede8eded05e1d633f9217de8de0bf47e716cc041a
parentbe801f6c506d9fbfb6c06afe94663abdb0037be5 (diff)
downloadceph-88ab8413de212f0751a679299e174f511c937f9b.tar.gz
Revert "global: call config observers on global_init (and start logging!)"
This reverts commit a30917746614275baeb718e902133f06ef44fba6. This commit includes calls that involve Mutexes, Lockers, and lockdep -- which isn't yet set up, so things break horribly. A more subtle approach is required. Signed-off-by: Greg Farnum <greg@inktank.com>
-rw-r--r--src/global/global_init.cc4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/global/global_init.cc b/src/global/global_init.cc
index 9a77e734801..0f7179c39df 100644
--- a/src/global/global_init.cc
+++ b/src/global/global_init.cc
@@ -106,10 +106,6 @@ 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);