Fix handling of bad config

[pazpar2-moved-to-github.git] / src / pazpar2.c

diff --git a/src/pazpar2.c b/src/pazpar2.c
index ae091cc..56d2599 100644 (file)
--- a/src/pazpar2.c
+++ b/src/pazpar2.c
@@ -34,22 +34,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include <yaz/sc.h>
 
+static char *path_override = 0;
+static struct conf_config *sc_stop_config = 0;
+
 void child_handler(void *data)
 {
-    struct conf_service *service = global_parameters.server->service;
-    start_proxy();
-
-    init_settings(service);
-
-    if (*global_parameters.settings_path_override)
-        settings_read(service, global_parameters.settings_path_override);
-    else if (global_parameters.server->settings)
-        settings_read(service, global_parameters.server->settings);
-    else
-        yaz_log(YLOG_WARN, "No settings-directory specified");
-    global_parameters.odr_in = odr_createmem(ODR_DECODE);
-    global_parameters.odr_out = odr_createmem(ODR_ENCODE);
-
+    struct conf_config *config = (struct conf_config *) data;
+    config_read_settings(config, path_override);
 
     pazpar2_event_loop();
 }
@@ -100,6 +91,9 @@ static int sc_main(
     const char *pidfile = 0;
     const char *uid = 0;
     int session_timeout = 60;
+    const char *listener_override = 0;
+    const char *proxy_override = 0;
+    struct conf_config *config = 0;
 
 #ifndef WIN32
     if (signal(SIGPIPE, SIG_IGN) == SIG_ERR)
@@ -122,11 +116,13 @@ static int sc_main(
             daemon = 1;
             break;
         case 'f':
-            if (!read_config(arg))
-                exit(1);
+            config = config_create(arg);
+            if (!config)
+                return 1;
+            sc_stop_config = config;
             break;
         case 'h':
-            strcpy(global_parameters.listener_override, arg);
+            listener_override = arg;
             break;
         case 'l':
             yaz_log_init_file(arg);
@@ -136,7 +132,7 @@ static int sc_main(
             pidfile = arg;
             break;
         case 't':
-            strcpy(global_parameters.settings_path_override, arg);
+            path_override = arg;
             break;
         case 'T':
            session_timeout = atoi(arg);
@@ -190,9 +186,7 @@ static int sc_main(
         yaz_log(YLOG_FATAL, "Load config with -f");
         return 1;
     }
-    global_parameters.server = config->servers;
-
-    ret = start_http_listener();
+    ret = config_start_listeners(config, listener_override, proxy_override);
     if (ret)
         return ret; /* error starting http listener */
 
@@ -201,7 +195,7 @@ static int sc_main(
     yaz_daemon("pazpar2",
                (global_parameters.debug_mode ? YAZ_DAEMON_DEBUG : 0) +
                (daemon ? YAZ_DAEMON_FORK : 0) + YAZ_DAEMON_KEEPALIVE,
-               child_handler, 0 /* child_data */,
+               child_handler, config /* child_data */,
                pidfile, uid);
     return 0;
 }
@@ -209,7 +203,7 @@ static int sc_main(
 
 static void sc_stop(yaz_sc_t s)
 {
-    http_close_server();
+    config_stop_listeners(sc_stop_config);
 }
 
 int main(int argc, char **argv)