X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fpazpar2.c;h=bc87e4c89400263108a968043bd3076a4193cbcc;hb=76913a6235a6410a02e00486093b45f93a04d2f1;hp=682da9c3542802e218c8a3b81afc1873f23857fc;hpb=beea258a9423652de5dba16306551df31fc5519e;p=pazpar2-moved-to-github.git

diff --git a/src/pazpar2.c b/src/pazpar2.c
index 682da9c..bc87e4c 100644
--- a/src/pazpar2.c
+++ b/src/pazpar2.c
@@ -1,4 +1,4 @@
-/* $Id: pazpar2.c,v 1.79 2007-04-16 09:03:25 adam Exp $
+/* $Id: pazpar2.c,v 1.92 2007-07-10 09:19:32 adam Exp $
    Copyright (c) 2006-2007, Index Data.
 
 This file is part of Pazpar2.
@@ -25,59 +25,101 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 
 #include <signal.h>
+#include <assert.h>
 
 #include "pazpar2.h"
 #include "database.h"
 #include "settings.h"
 
+void child_handler(void *data)
+{
+    start_proxy();
+    init_settings();
+
+    if (*global_parameters.settings_path_override)
+        settings_read(global_parameters.settings_path_override);
+    else if (global_parameters.server->settings)
+        settings_read(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);
+
+
+    pazpar2_event_loop();
+
+}
+
 int main(int argc, char **argv)
 {
+    int daemon = 0;
     int ret;
+    int log_file_in_use = 0;
     char *arg;
+    const char *pidfile = 0;
+    const char *uid = 0;
 
     if (signal(SIGPIPE, SIG_IGN) == SIG_ERR)
         yaz_log(YLOG_WARN|YLOG_ERRNO, "signal");
 
-    yaz_log_init(YLOG_DEFAULT_LEVEL, "pazpar2", 0);
+    yaz_log_init_prefix("pazpar2");
 
-    while ((ret = options("t:f:x:h:p:z:s:d", argv, argc, &arg)) != -2)
+    while ((ret = options("dDf:h:l:p:t:u:X", argv, argc, &arg)) != -2)
     {
-	switch (ret) {
-            case 'f':
-                if (!read_config(arg))
-                    exit(1);
-                break;
-            case 'h':
-                strcpy(global_parameters.listener_override, arg);
-                break;
-            case 'p':
-                strcpy(global_parameters.proxy_override, arg);
-                break;
-            case 'z':
-                strcpy(global_parameters.zproxy_override, arg);
-                break;
-            case 't':
-                strcpy(global_parameters.settings_path_override, arg);
-                break;
-            case 's':
-                load_simpletargets(arg);
-                break;
-            case 'd':
-                global_parameters.dump_records = 1;
-                break;
-	    default:
-		fprintf(stderr, "Usage: pazpar2\n"
-                        "    -f configfile\n"
-                        "    -h [host:]port          (REST protocol listener)\n"
-                        "    -C cclconfig\n"
-                        "    -s simpletargetfile\n"
-                        "    -p hostname[:portno]    (HTTP proxy)\n"
-                        "    -z hostname[:portno]    (Z39.50 proxy)\n"
-                        "    -d                      (show internal records)\n");
-		exit(1);
+	switch (ret)
+        {
+        case 'd':
+            global_parameters.dump_records = 1;
+            break;
+        case 'D':
+            daemon = 1;
+            break;
+        case 'f':
+            if (!read_config(arg))
+                exit(1);
+            break;
+        case 'h':
+            strcpy(global_parameters.listener_override, arg);
+            break;
+        case 'l':
+            yaz_log_init_file(arg);
+            log_file_in_use = 1;
+            break;
+        case 'p':
+            pidfile = arg;
+            break;
+        case 't':
+            strcpy(global_parameters.settings_path_override, arg);
+            break;
+        case 'u':
+            uid = arg;
+            break;
+        case 'X':
+            global_parameters.debug_mode = 1;
+            break;
+        default:
+            fprintf(stderr, "Usage: pazpar2\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"
+                    "    -p pidfile              PID file\n"
+                    "    -t settings\n"
+                    "    -u uid\n"
+                    "    -X                      debug mode\n"
+                );
+            exit(1);
 	}
     }
 
+    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");
+        exit(1);
+    }
     if (!config)
     {
         yaz_log(YLOG_FATAL, "Load config with -f");
@@ -86,24 +128,13 @@ int main(int argc, char **argv)
     global_parameters.server = config->servers;
 
     start_http_listener();
-    start_proxy();
-    start_zproxy();
-
-    if (*global_parameters.settings_path_override)
-        settings_read(global_parameters.settings_path_override);
-    else if (global_parameters.server->settings)
-        settings_read(global_parameters.server->settings);
-    else
-        yaz_log(YLOG_WARN, "No settings-directory specified. Problems may well ensue!");
-    prepare_databases();
-    global_parameters.odr_in = odr_createmem(ODR_DECODE);
-    global_parameters.odr_out = odr_createmem(ODR_ENCODE);
-
-    event_loop(&channel_list);
-
+    pazpar2_process(global_parameters.debug_mode, daemon,
+                    child_handler, 0 /* child_data */,
+                    pidfile, uid);
     return 0;
 }
 
+
 /*
  * Local variables:
  * c-basic-offset: 4