summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2012-12-10 13:29:21 -0800
committerSage Weil <sage@inktank.com>2012-12-10 14:44:16 -0800
commit6fb9a5580e59d26843971851b1503dc4bde6542c (patch)
tree3ac94f81789508c44e3c4d52dcc3af9fd9506069
parente4d0aeace187afee6313d803511ba595e91dd7ed (diff)
downloadceph-6fb9a5580e59d26843971851b1503dc4bde6542c.tar.gz
config: always complain about config parse errors
Complain about config parsing errors even when it is the default config file. We may also want to fail instead of continuing, but that is a separate issue. Signed-off-by: Sage Weil <sage@inktank.com>
-rw-r--r--src/global/global_init.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/global/global_init.cc b/src/global/global_init.cc
index 97549bfb9d6..0182fb0ccaa 100644
--- a/src/global/global_init.cc
+++ b/src/global/global_init.cc
@@ -104,9 +104,7 @@ void global_init(std::vector < const char * > *alt_def_args, std::vector < const
g_lockdep = cct->_conf->lockdep;
// Now we're ready to complain about config file parse errors
- if (conf_file_list.length()) {
- complain_about_parse_errors(cct, &parse_errors);
- }
+ complain_about_parse_errors(cct, &parse_errors);
// signal stuff
int siglist[] = { SIGPIPE, 0 };