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

diff --git a/src/pazpar2.c b/src/pazpar2.c
index 7eecacb..25674e7 100644
--- a/src/pazpar2.c
+++ b/src/pazpar2.c
@@ -32,6 +32,14 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "settings.h"
 #include <yaz/daemon.h>
 
+#if YAZ_VERSIONL >= 0x03001D
+/* Windows service is available in YAZ 3.0.29 or later */
+#define USE_SC 1
+#include <yaz/sc.h>
+#else
+#define USE_SC 0
+#endif
+
 void child_handler(void *data)
 {
     start_proxy();
@@ -81,7 +89,11 @@ static int tcpip_init (void)
 #endif
 
 
-int main(int argc, char **argv)
+static int sc_main(
+#if USE_SC
+    yaz_sc_t s, 
+#endif
+    int argc, char **argv)
 {
     int daemon = 0;
     int ret;
@@ -89,7 +101,10 @@ int main(int argc, char **argv)
     char *arg;
     const char *pidfile = 0;
     const char *uid = 0;
+    int i;
 
+    for (i = 0; i < argc; i++)
+        yaz_log(YLOG_LOG, "arg%d: %s", i, argv[i]);
 #ifndef WIN32
     if (signal(SIGPIPE, SIG_IGN) == SIG_ERR)
         yaz_log(YLOG_WARN|YLOG_ERRNO, "signal");
@@ -151,7 +166,7 @@ int main(int argc, char **argv)
                     "    -V                      show version\n"
                     "    -X                      debug mode\n"
                 );
-            exit(1);
+            return 1;
 	}
     }
 
@@ -160,16 +175,23 @@ int main(int argc, char **argv)
     {
         yaz_log(YLOG_FATAL, "Logfile must be given (option -l) for daemon "
                 "mode");
-        exit(1);
+        return 1;
     }
     if (!config)
     {
         yaz_log(YLOG_FATAL, "Load config with -f");
-        exit(1);
+        return 1;
     }
     global_parameters.server = config->servers;
 
-    start_http_listener();
+    ret = start_http_listener();
+    if (ret)
+        return ret; /* error starting http listener */
+
+#if USE_SC
+    yaz_sc_running(s);
+#endif
+
     yaz_daemon("pazpar2",
                (global_parameters.debug_mode ? YAZ_DAEMON_DEBUG : 0) +
                (daemon ? YAZ_DAEMON_FORK : 0) + YAZ_DAEMON_KEEPALIVE,
@@ -179,6 +201,28 @@ int main(int argc, char **argv)
 }
 
 
+#if USE_SC
+static void sc_stop(yaz_sc_t s)
+{
+    http_close_server();
+}
+#endif
+
+int main(int argc, char **argv)
+{
+    int ret;
+#if USE_SC
+    yaz_sc_t s = yaz_sc_create("pazpar2", "Pazpar2");
+
+    ret = yaz_sc_program(s, argc, argv, sc_main, sc_stop);
+
+    yaz_sc_destroy(&s);
+#else
+    ret = sc_main(argc, argv);
+#endif
+    exit(ret);
+}
+
 /*
  * Local variables:
  * c-basic-offset: 4