From: Greg Farnum Date: Tue, 9 Apr 2013 01:20:53 +0000 (-0700) Subject: Revert "global: call config observers on global_init (and start logging!)" X-Git-Tag: v0.61~216 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=88ab8413de212f0751a679299e174f511c937f9b;p=ceph.git 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 --- diff --git a/src/global/global_init.cc b/src/global/global_init.cc index 9a77e7348013..0f7179c39dfd 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);