main: separate loading of config and setup_logging at startup

[obnox/tinyproxy.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index a35ba9720d8e61725669cf95096a8f226d1dc3e8..e7801773e6dbca50f65c0aa93dd6d92710e2da16 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -386,7 +386,14 @@ main (int argc, char **argv)
 
         log_message (LOG_INFO, "Initializing " PACKAGE " ...");
 
-        ret = reload_config ();
+        ret = reload_config_file (config_defaults.config_file,
+                                  &config,
+                                  &config_defaults);
+        if (ret != 0) {
+                exit (EX_SOFTWARE);
+        }
+
+        ret = setup_logging ();
         if (ret != 0) {
                 exit (EX_SOFTWARE);
         }