diff options
| author | Sage Weil <sage@inktank.com> | 2012-12-11 15:07:38 -0800 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2012-12-11 15:07:38 -0800 |
| commit | 6007088c537626f69c648e644a1bfb3faec1cba8 (patch) | |
| tree | f3763c3a8e2e76b0113324753943af1b7448b215 | |
| parent | 9a40ef013140994466fb7dc8833838a5aab75baa (diff) | |
| parent | a50c7d3b2f9eaca53a96f7942eaa203a849b3317 (diff) | |
| download | ceph-6007088c537626f69c648e644a1bfb3faec1cba8.tar.gz | |
Merge remote-tracking branch 'gh/wip-conf' into next
Reviewed-by: Greg Farnu <greg@inktank.com>
| -rw-r--r-- | src/common/ConfUtils.cc | 3 | ||||
| -rw-r--r-- | src/global/global_init.cc | 9 | ||||
| -rw-r--r-- | src/test/cli/ceph-conf/env-vs-args.t | 2 |
3 files changed, 6 insertions, 8 deletions
diff --git a/src/common/ConfUtils.cc b/src/common/ConfUtils.cc index a9e5d7a42f5..147cdc2fb60 100644 --- a/src/common/ConfUtils.cc +++ b/src/common/ConfUtils.cc @@ -101,9 +101,6 @@ parse_file(const std::string &fname, std::deque<std::string> *errors, FILE *fp = fopen(fname.c_str(), "r"); if (!fp) { ret = -errno; - ostringstream oss; - oss << "read_conf: failed to open '" << fname << "': " << cpp_strerror(ret); - errors->push_back(oss.str()); return ret; } diff --git a/src/global/global_init.cc b/src/global/global_init.cc index 97549bfb9d6..43ce0909565 100644 --- a/src/global/global_init.cc +++ b/src/global/global_init.cc @@ -82,7 +82,10 @@ void global_init(std::vector < const char * > *alt_def_args, std::vector < const else if (ret == -EINVAL) { if (!(flags & CINIT_FLAG_NO_DEFAULT_CONFIG_FILE)) { if (conf_file_list.length()) { - dout_emergency("global_init: unable to open config file.\n"); + ostringstream oss; + oss << "global_init: unable to open config file from search list " + << conf_file_list << "\n"; + dout_emergency(oss.str()); _exit(1); } else { derr <<"did not load config file, using default settings." << dendl; @@ -104,9 +107,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 }; diff --git a/src/test/cli/ceph-conf/env-vs-args.t b/src/test/cli/ceph-conf/env-vs-args.t index 7eefd98b793..76b2dec9cfb 100644 --- a/src/test/cli/ceph-conf/env-vs-args.t +++ b/src/test/cli/ceph-conf/env-vs-args.t @@ -5,6 +5,6 @@ # command-line arguments should override environment $ env -u CEPH_CONF ceph-conf -c from-args - global_init: unable to open config file. (re) + global_init: unable to open config file from search list from-args [1] |