X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fpazpar2.c;h=7eecacb8fcb11efe38dc76e2298df06bdd5e234d;hb=3f46a4cb43b195b827e585b8806a9fcd3f23d466;hp=e3d66276ce60fea0452fec610cc47888de1edf4f;hpb=2dcca58dcfd42a54b98f413a2bbb8676e05302d4;p=pazpar2-moved-to-github.git

diff --git a/src/pazpar2.c b/src/pazpar2.c
index e3d6627..7eecacb 100644
--- a/src/pazpar2.c
+++ b/src/pazpar2.c
@@ -1,7 +1,5 @@
-/* $Id: pazpar2.c,v 1.89 2007-06-12 13:02:38 adam Exp $
-   Copyright (c) 2006-2007, Index Data.
-
-This file is part of Pazpar2.
+/* This file is part of Pazpar2.
+   Copyright (C) 2006-2008 Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -14,15 +12,17 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with Pazpar2; see the file LICENSE.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
- */
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
 
 #if HAVE_CONFIG_H
-#include "cconfig.h"
+#include <config.h>
+#endif
+#ifdef WIN32
+#include <winsock.h>
 #endif
-
 
 #include <signal.h>
 #include <assert.h>
@@ -30,6 +30,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include "pazpar2.h"
 #include "database.h"
 #include "settings.h"
+#include <yaz/daemon.h>
 
 void child_handler(void *data)
 {
@@ -50,22 +51,68 @@ void child_handler(void *data)
 
 }
 
+static void show_version(void)
+{
+    char yaz_version_str[80];
+    printf("Pazpar2 " PACKAGE_VERSION "\n");
+
+    yaz_version(yaz_version_str, 0);
+
+    printf("Configuration:");
+#if HAVE_ICU
+    printf(" icu:?");
+#endif
+    printf(" yaz:%s", yaz_version_str);
+    printf("\n");
+    exit(0);
+}            
+
+#ifdef WIN32
+static int tcpip_init (void)
+{
+    WORD requested;
+    WSADATA wd;
+
+    requested = MAKEWORD(1, 1);
+    if (WSAStartup(requested, &wd))
+        return 0;
+    return 1;
+}
+#endif
+
+
 int main(int argc, char **argv)
 {
+    int daemon = 0;
     int ret;
+    int log_file_in_use = 0;
     char *arg;
-    const char *pidfile = "pazpar2.pid";
+    const char *pidfile = 0;
     const char *uid = 0;
 
+#ifndef WIN32
     if (signal(SIGPIPE, SIG_IGN) == SIG_ERR)
         yaz_log(YLOG_WARN|YLOG_ERRNO, "signal");
+#else
+    tcpip_init();
+#endif
 
     yaz_log_init_prefix("pazpar2");
+#if YAZ_VERSIONL >= 0x03001B
+    yaz_log_xml_errors(0, YLOG_WARN);
+#endif
 
-    while ((ret = options("f:h:p:t:u:l:dX", argv, argc, &arg)) != -2)
+
+    while ((ret = options("dDf:h:l:p:t:u:VX", argv, argc, &arg)) != -2)
     {
 	switch (ret)
         {
+        case 'd':
+            global_parameters.dump_records = 1;
+            break;
+        case 'D':
+            daemon = 1;
+            break;
         case 'f':
             if (!read_config(arg))
                 exit(1);
@@ -73,6 +120,10 @@ int main(int argc, char **argv)
         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;
@@ -82,30 +133,35 @@ int main(int argc, char **argv)
         case 'u':
             uid = arg;
             break;
-        case 'd':
-            global_parameters.dump_records = 1;
-            break;
-        case 'l':
-            yaz_log_init_file(arg);
-            break;
+        case 'V':
+            show_version();
         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"
-                    "    -d                      (show internal records)\n"
-                    "    -l file                 log to file\n"
+                    "    -V                      show version\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");
@@ -114,9 +170,11 @@ int main(int argc, char **argv)
     global_parameters.server = config->servers;
 
     start_http_listener();
-    pazpar2_process(global_parameters.debug_mode,
-                    child_handler, 0 /* child_data */,
-                    pidfile, uid);
+    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;
 }