Avoid conditions for YAZ features.. Require YAZ 3.0.29 or later.

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

diff --git a/src/pazpar2.c b/src/pazpar2.c
index 7eecacb..0ede6be 100644 (file)
--- a/src/pazpar2.c
+++ b/src/pazpar2.c
@@ -32,6 +32,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "settings.h"
 #include <yaz/daemon.h>
 
+#include <yaz/sc.h>
+
 void child_handler(void *data)
 {
     start_proxy();
@@ -81,7 +83,9 @@ static int tcpip_init (void)
 #endif
 
 
-int main(int argc, char **argv)
+static int sc_main(
+    yaz_sc_t s, 
+    int argc, char **argv)
 {
     int daemon = 0;
     int ret;
@@ -98,10 +102,7 @@ int main(int argc, char **argv)
 #endif
 
     yaz_log_init_prefix("pazpar2");
-#if YAZ_VERSIONL >= 0x03001B
     yaz_log_xml_errors(0, YLOG_WARN);
-#endif
-
 
     while ((ret = options("dDf:h:l:p:t:u:VX", argv, argc, &arg)) != -2)
     {
@@ -150,8 +151,12 @@ int main(int argc, char **argv)
                     "    -u uid\n"
                     "    -V                      show version\n"
                     "    -X                      debug mode\n"
+#ifdef WIN32
+                    "    -install                install windows service\n"
+                    "    -remove                 remove windows service\n"
+#endif
                 );
-            exit(1);
+            return 1;
        }
     }
 
@@ -160,16 +165,21 @@ 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 */
+
+    yaz_sc_running(s);
+
     yaz_daemon("pazpar2",
                (global_parameters.debug_mode ? YAZ_DAEMON_DEBUG : 0) +
                (daemon ? YAZ_DAEMON_FORK : 0) + YAZ_DAEMON_KEEPALIVE,
@@ -179,6 +189,22 @@ int main(int argc, char **argv)
 }
 
 
+static void sc_stop(yaz_sc_t s)
+{
+    http_close_server();
+}
+
+int main(int argc, char **argv)
+{
+    int ret;
+    yaz_sc_t s = yaz_sc_create("pazpar2", "Pazpar2");
+
+    ret = yaz_sc_program(s, argc, argv, sc_main, sc_stop);
+
+    yaz_sc_destroy(&s);
+    exit(ret);
+}
+
 /*
  * Local variables:
  * c-basic-offset: 4