config: some cleanup

diff --git a/src/common/common_init.cc b/src/common/common_init.cc
index cebd329f7fd0a2c6c1de9f64c5d50d9c95c243f5..d87ee8493d9fcc5448246b4deb2d14123f46d80f 100644 (file)
--- a/src/common/common_init.cc
+++ b/src/common/common_init.cc
@@ -6,7 +6,11 @@ void common_init(std::vector<const char*>& args, bool open)
 {
   tls_init();
   tls_get_val()->disable_assert = 0;
-  preparse_config_options(args, open);
-  parse_config_options(args, open);
+  parse_startup_config_options(args);
+  parse_config_options(args);
+
+  // open log file?
+ if (open)
+    _dout_open_log();
 }
 

diff --git a/src/config.cc b/src/config.cc
index 42ff71435e9a269ceb9bab66a9521ca571aa9809..3d27dd96367f280f9cb0caf4e6679423f5629bb5 100644 (file)
--- a/src/config.cc
+++ b/src/config.cc
@@ -290,7 +290,7 @@ void parse_config_option_string(string& s)
     *p++ = 0;
     while (*p && *p == ' ') p++;
   }
-  parse_config_options(nargs, false);
+  parse_config_options(nargs);
 }
 
 void sighup_handler(int signum)
@@ -731,7 +731,7 @@ void parse_config_file(ConfFile *cf, bool auto_update)
   
 }
 
-void preparse_config_options(std::vector<const char*>& args, bool open)
+void parse_startup_config_options(std::vector<const char*>& args)
 {
   unsigned int val_pos;
 
@@ -772,7 +772,7 @@ void preparse_config_options(std::vector<const char*>& args, bool open)
     cf.dump();
 }
 
-void parse_config_options(std::vector<const char*>& args, bool open)
+void parse_config_options(std::vector<const char*>& args)
 {
   int opt_len = sizeof(config_optionsp)/sizeof(config_option);
   unsigned int val_pos;
@@ -800,11 +800,6 @@ void parse_config_options(std::vector<const char*>& args, bool open)
         nargs.push_back(args[i]);
   }
 
- // open log file?
-
-  if (open)
-    _dout_open_log();
-  
   signal(SIGHUP, sighup_handler);
 
   args = nargs;

diff --git a/src/config.h b/src/config.h
index f6a8a760319651a06977fb3865108489055ed6e8..ec5a50743ad5c63bcf8a07d8e477a207e7b60a68 100644 (file)
--- a/src/config.h
+++ b/src/config.h
@@ -350,8 +350,8 @@ void argv_to_vec(int argc, const char **argv,
 void vec_to_argv(std::vector<const char*>& args,
                  int& argc, const char **&argv);
 
-void preparse_config_options(std::vector<const char*>& args, bool open=true);
-void parse_config_options(std::vector<const char*>& args, bool open=true);
+void parse_startup_config_options(std::vector<const char*>& args);
+void parse_config_options(std::vector<const char*>& args);
 void parse_config_option_string(string& s);
 
 extern bool parse_ip_port(const char *s, entity_addr_t& addr);