rgw: process default alt args before processing conf file

this fixes #2189

Signed-off-by: Yehuda Sadeh <yehuda@hq.newdream.net>

diff --git a/src/global/global_init.cc b/src/global/global_init.cc
index b385680fa3b59ed341687895b24cbebb712f5b0d..99d9ef00aafc20ad000efc83438ad3a1017782f5 100644 (file)
--- 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