Use AM_LDFLAGS instead of LDFLAGS

[yazpp-moved-to-github.git] / src / yaz-proxy-main.cpp

diff --git a/src/yaz-proxy-main.cpp b/src/yaz-proxy-main.cpp
index af64283..4a7a9b7 100644 (file)
--- a/src/yaz-proxy-main.cpp
+++ b/src/yaz-proxy-main.cpp
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 1998-2003, Index Data.
+ * Copyright (c) 1998-2004, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: yaz-proxy-main.cpp,v 1.23 2003-10-23 12:14:48 adam Exp $
+ * $Id: yaz-proxy-main.cpp,v 1.30 2004-01-12 22:35:26 adam Exp $
  */
 
 #include <signal.h>
@@ -19,14 +19,15 @@
 
 void usage(char *prog)
 {
-    fprintf (stderr, "%s: [-c config] [-a log] [-m num] [-v level] [-t target] [-i sec] "
-             "[-u uid] [-p pidfile] [-o optlevel] @:port\n", prog);
+    fprintf (stderr, "%s: [-c config] [-l log] [-a log] [-v level] [-t target] "
+             "[-u uid] [-p pidfile] @:port\n", prog);
     exit (1);
 }
 
 static char *pid_fname = 0;
 static char *uid = 0;
 static char *log_file = 0;
+static int debug = 0;
 
 int args(Yaz_Proxy *proxy, int argc, char **argv)
 {
@@ -35,7 +36,8 @@ int args(Yaz_Proxy *proxy, int argc, char **argv)
     char *prog = argv[0];
     int ret;
 
-    while ((ret = options("o:a:t:v:c:u:i:m:l:T:p:U:", argv, argc, &arg)) != -2)
+    while ((ret = options("o:a:t:v:c:u:i:m:l:T:p:U:X",
+                         argv, argc, &arg)) != -2)
     {
        int err;
         switch (ret)
@@ -89,6 +91,9 @@ int args(Yaz_Proxy *proxy, int argc, char **argv)
         case 'T':
            proxy->set_target_idletime(atoi(arg));
            break;
+       case 'X':
+           debug = 1;
+           break;
        case 'p':
            if (!pid_fname)
                pid_fname = xstrdup(arg);
@@ -121,22 +126,17 @@ int args(Yaz_Proxy *proxy, int argc, char **argv)
 static Yaz_Proxy *static_yaz_proxy = 0;
 static void sighup_handler(int num)
 {
+    signal(SIGHUP, sighup_handler);
     if (static_yaz_proxy)
        static_yaz_proxy->reconfig();
 }
 
-int main(int argc, char **argv)
-{
-    static int mk_pid = 0;
-    Yaz_SocketManager mySocketManager;
-    Yaz_Proxy proxy(new Yaz_PDU_Assoc(&mySocketManager));
-
-    static_yaz_proxy = &proxy;
 
+static void child_run(Yaz_SocketManager *m, int run)
+{
     signal(SIGHUP, sighup_handler);
 
-    args(&proxy, argc, argv);
-
+    yaz_log(LOG_LOG, "0 proxy run=%d pid=%ld", run, (long) getpid());
     if (pid_fname)
     {
        FILE *f = fopen(pid_fname, "w");
@@ -172,9 +172,93 @@ int main(int argc, char **argv)
        xfree(uid);
     }
 
-    while (mySocketManager.processEvent() > 0)
+    while (m->processEvent() > 0)
        ;
 
     exit (0);
+}
+
+int main(int argc, char **argv)
+{
+#if HAVE_XSLT
+    xmlInitMemory();
+    
+    LIBXML_TEST_VERSION
+#endif
+    int cont = 1;
+    int run = 1;
+    Yaz_SocketManager mySocketManager;
+    Yaz_Proxy proxy(new Yaz_PDU_Assoc(&mySocketManager));
+
+    static_yaz_proxy = &proxy;
+
+    args(&proxy, argc, argv);
+
+    if (debug)
+    {
+       child_run(&mySocketManager, run);
+       exit(0);
+    }
+    while (cont)
+    {
+       pid_t p = fork();
+       if (p == (pid_t) -1)
+       {
+           yaz_log(LOG_FATAL|LOG_ERRNO, "fork");
+           exit(1);
+       }
+       else if (p == 0)
+       {
+           child_run(&mySocketManager, run);
+       }
+       pid_t p1;
+       int status;
+       p1 = wait(&status);
+
+       yaz_log_reopen();
+
+       if (p1 != p)
+       {
+           yaz_log(LOG_FATAL, "p1=%d != p=%d", p1, p);
+           exit(1);
+       }
+       if (WIFSIGNALED(status))
+       {
+           switch(WTERMSIG(status)) {
+           case SIGILL:
+               yaz_log(LOG_WARN, "Received SIGILL from child %ld", (long) p);
+               cont = 1;
+               break;
+           case SIGABRT:
+               yaz_log(LOG_WARN, "Received SIGABRT from child %ld", (long) p);
+               cont = 1;
+               break ;
+           case SIGSEGV:
+               yaz_log(LOG_WARN, "Received SIGSEGV from child %ld", (long) p);
+               cont = 1;
+               break;
+           case SIGTERM:
+               yaz_log(LOG_LOG, "Received SIGTERM from child %ld",
+                       (long) p);
+               cont = 0;
+               break;
+           default:
+               yaz_log(LOG_WARN, "Received SIG %d from child %ld",
+                       WTERMSIG(status), (long) p);
+               cont = 0;
+           }
+       }
+       else if (status == 0)
+           cont = 0;
+       else
+       {
+           yaz_log(LOG_LOG, "Exit %d from child %ld", status, (long) p);
+           cont = 1;
+       }
+       if (cont)
+           sleep(1);
+       run++;
+    }
+    exit (0);
     return 0;
 }