X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fpazpar2.c;h=5070a10e9757b0f2d49ff5987105eac88c38b90f;hb=7ab0676c686a45df10325dc96ec42e5f3210d9d7;hp=ae091cc158402bc61be4ff34d32cb62807d60f33;hpb=f5d345051217a4f54a53dac5a7397f5672e305ad;p=pazpar2-moved-to-github.git

diff --git a/src/pazpar2.c b/src/pazpar2.c
index ae091cc..5070a10 100644
--- 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 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_start_databases(config);
 
     pazpar2_event_loop();
 }
@@ -100,6 +91,10 @@ static int sc_main(
     const char *pidfile = 0;
     const char *uid = 0;
     int session_timeout = 60;
+    const char *listener_override = 0;
+    const char *config_fname = 0;
+    struct conf_config *config = 0;
+    int test_mode = 0;
 
 #ifndef WIN32
     if (signal(SIGPIPE, SIG_IGN) == SIG_ERR)
@@ -111,7 +106,7 @@ static int sc_main(
     yaz_log_init_prefix("pazpar2");
     yaz_log_xml_errors(0, YLOG_WARN);
 
-    while ((ret = options("dDf:h:l:p:t:T:u:VX", argv, argc, &arg)) != -2)
+    while ((ret = options("dDf:h:l:p:tT:u:VX", argv, argc, &arg)) != -2)
     {
 	switch (ret)
         {
@@ -122,11 +117,10 @@ static int sc_main(
             daemon = 1;
             break;
         case 'f':
-            if (!read_config(arg))
-                exit(1);
+            config_fname = arg;
             break;
         case 'h':
-            strcpy(global_parameters.listener_override, arg);
+            listener_override = arg;
             break;
         case 'l':
             yaz_log_init_file(arg);
@@ -136,7 +130,7 @@ static int sc_main(
             pidfile = arg;
             break;
         case 't':
-            strcpy(global_parameters.settings_path_override, arg);
+            test_mode = 1;
             break;
         case 'T':
 	    session_timeout = atoi(arg);
@@ -158,58 +152,67 @@ static int sc_main(
             break;
         default:
             fprintf(stderr, "Usage: pazpar2\n"
-                    "    -d                      (show internal records)\n"
+                    "    -d                      Show internal records\n"
                     "    -D                      Daemon mode (background)\n"
-                    "    -f configfile\n"
-                    "    -h [host:]port          (REST protocol listener)\n"
-                    "    -l file                 log to file\n"
+                    "    -f configfile           Configuration\n"
+                    "    -h [host:]port          Listener port\n"
+                    "    -l file                 Log to file\n"
                     "    -p pidfile              PID file\n"
-                    "    -t settings\n"
-                    "    -T session_timeout\n"
-                    "    -u uid\n"
-                    "    -V                      show version\n"
-                    "    -X                      debug mode\n"
+                    "    -t                      Test configuration\n"
+                    "    -T session_timeout      Session timeout\n"
+                    "    -u uid                  Change user to uid\n"
+                    "    -V                      Show version\n"
+                    "    -X                      Debug mode\n"
 #ifdef WIN32
-                    "    -install                install windows service\n"
-                    "    -remove                 remove windows service\n"
+                    "    -install                Install windows service\n"
+                    "    -remove                 Remove windows service\n"
 #endif
                 );
             return 1;
 	}
     }
-
-    yaz_log(YLOG_LOG, "Pazpar2 %s started", VERSION);
-    if (daemon && !log_file_in_use)
+    if (!config_fname)
     {
-        yaz_log(YLOG_FATAL, "Logfile must be given (option -l) for daemon "
-                "mode");
+        yaz_log(YLOG_FATAL, "Configuration must be given with option -f");
         return 1;
     }
+    config = config_create(config_fname, global_parameters.dump_records);
     if (!config)
-    {
-        yaz_log(YLOG_FATAL, "Load config with -f");
         return 1;
+    sc_stop_config = config;
+    if (test_mode)
+    {
+        yaz_log(YLOG_LOG, "Configuration OK");
+        config_destroy(config);
+    }
+    else
+    {
+        yaz_log(YLOG_LOG, "Pazpar2 %s started", VERSION);
+        if (daemon && !log_file_in_use)
+        {
+            yaz_log(YLOG_FATAL, "Logfile must be given (option -l) for daemon "
+                    "mode");
+            return 1;
+        }
+        ret = config_start_listeners(config, listener_override);
+        if (ret)
+            return ret; /* error starting http listener */
+        
+        yaz_sc_running(s);
+        
+        yaz_daemon("pazpar2",
+                   (global_parameters.debug_mode ? YAZ_DAEMON_DEBUG : 0) +
+                   (daemon ? YAZ_DAEMON_FORK : 0) + YAZ_DAEMON_KEEPALIVE,
+                   child_handler, config /* child_data */,
+                   pidfile, uid);
     }
-    global_parameters.server = config->servers;
-
-    ret = start_http_listener();
-    if (ret)
-        return ret; /* error starting http listener */
-
-    yaz_sc_running(s);
-
-    yaz_daemon("pazpar2",
-               (global_parameters.debug_mode ? YAZ_DAEMON_DEBUG : 0) +
-               (daemon ? YAZ_DAEMON_FORK : 0) + YAZ_DAEMON_KEEPALIVE,
-               child_handler, 0 /* child_data */,
-               pidfile, uid);
     return 0;
 }
 
 
 static void sc_stop(yaz_sc_t s)
 {
-    http_close_server();
+    config_stop_listeners(sc_stop_config);
 }
 
 int main(int argc, char **argv)