From e42fbb70be1f8ffdedd0049070b0611fb4288355 Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Tue, 20 Mar 2012 10:52:14 -0700 Subject: [PATCH] rgw: process default alt args before processing conf file this fixes #2189 Signed-off-by: Yehuda Sadeh --- src/global/global_init.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/global/global_init.cc b/src/global/global_init.cc index b385680fa3b59..99d9ef00aafc2 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 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 -- 2.39.5