diff options
| author | Yehuda Sadeh <yehuda@hq.newdream.net> | 2012-03-20 18:52:14 +0100 |
|---|---|---|
| committer | Yehuda Sadeh <yehuda@hq.newdream.net> | 2012-03-20 18:52:14 +0100 |
| commit | e0b8f7a0331b0ceee54a911bb9231cb168eb2d0f (patch) | |
| tree | 428a8dcb91723be9d7d07840bf4559817fceafdb /src/global | |
| parent | rgw: incrase socket backlog (diff) | |
| download | ceph-e0b8f7a0331b0ceee54a911bb9231cb168eb2d0f.tar.xz ceph-e0b8f7a0331b0ceee54a911bb9231cb168eb2d0f.zip | |
rgw: process default alt args before processing conf file
this fixes #2189
Signed-off-by: Yehuda Sadeh <yehuda@hq.newdream.net>
Diffstat (limited to 'src/global')
| -rw-r--r-- | src/global/global_init.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/global/global_init.cc b/src/global/global_init.cc index 6609355524b..60c0c4d0114 100644 --- a/src/global/global_init.cc +++ b/src/global/global_init.cc @@ -68,6 +68,10 @@ void global_init(std::vector < const char * > *alt_def_args, std::vector < const global_init_set_globals(cct); md_config_t *conf = cct->_conf; + + if (alt_def_args) + conf->parse_argv(*alt_def_args); // alternative default args + std::deque<std::string> parse_errors; int ret = conf->parse_config_files(c_str_or_null(conf_file_list), &parse_errors, flags); if (ret == -EDOM) { @@ -85,9 +89,6 @@ void global_init(std::vector < const char * > *alt_def_args, std::vector < const _exit(1); } - if (alt_def_args) - conf->parse_argv(*alt_def_args); // alternative default args - conf->parse_env(); // environment variables override conf->parse_argv(args); // argv override |