From: Sage Weil <sage@redhat.com>
Date: Thu, 3 Mar 2016 16:13:32 +0000 (-0500)
Subject: global: complain about parse errors after we open the log
X-Git-Tag: v10.1.0~217^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=50653cf83df421111b1ee10b03800b5ed9b1f690;p=ceph.git

global: complain about parse errors after we open the log

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

diff --git a/src/global/global_init.cc b/src/global/global_init.cc
index b6b57b85b8104..8ac56c277f4c9 100644
--- a/src/global/global_init.cc
+++ b/src/global/global_init.cc
@@ -256,6 +256,9 @@ void global_init(std::vector < const char * > *alt_def_args,
     }
   }
 
+  // Now we're ready to complain about config file parse errors
+  g_conf->complain_about_parse_errors(g_ceph_context);
+
   // test leak checking
   if (g_conf->debug_deliberately_leak_memory) {
     derr << "deliberately leaking some memory" << dendl;
diff --git a/src/tools/ceph_conf.cc b/src/tools/ceph_conf.cc
index b67ea5c793ac8..f047e7ca87cc7 100644
--- a/src/tools/ceph_conf.cc
+++ b/src/tools/ceph_conf.cc
@@ -154,6 +154,7 @@ int main(int argc, const char **argv)
   global_pre_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, CODE_ENVIRONMENT_DAEMON,
 		  CINIT_FLAG_NO_DAEMON_ACTIONS);
   g_conf->apply_changes(NULL);
+  g_conf->complain_about_parse_errors(g_ceph_context);
 
   // do not common_init_finish(); do not start threads; do not do any of thing
   // wonky things the daemon whose conf we are examining would do (like initialize