X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;ds=sidebyside;f=src%2Fyaz-proxy-main.cpp;h=03c0f61c56759ce3807844600966905f8d1324f2;hb=8bc5c9154d4c59571b6a6f19d8082a230d3c8a8a;hp=06df98e6d1ab2c238f17777b82eafbb99e298f61;hpb=277e55dae549f6fa6b9ad22d8ebd89af53bcd71b;p=yazpp-moved-to-github.git

diff --git a/src/yaz-proxy-main.cpp b/src/yaz-proxy-main.cpp
index 06df98e..03c0f61 100644
--- a/src/yaz-proxy-main.cpp
+++ b/src/yaz-proxy-main.cpp
@@ -2,13 +2,14 @@
  * Copyright (c) 1998-2004, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: yaz-proxy-main.cpp,v 1.27 2004-01-05 11:31:04 adam Exp $
+ * $Id: yaz-proxy-main.cpp,v 1.32 2004-02-10 15:02:19 adam Exp $
  */
 
 #include <signal.h>
 #include <unistd.h>
 #include <pwd.h>
 #include <sys/types.h>
+#include <stdarg.h>
 
 #include <yaz/log.h>
 #include <yaz/options.h>
@@ -109,7 +110,6 @@ int args(Yaz_Proxy *proxy, int argc, char **argv)
     }
     if (addr)
     {
-	yaz_log(LOG_LOG, "0 Starting proxy " VERSION );
 	if (proxy->server(addr))
 	{
 	    yaz_log(LOG_FATAL|LOG_ERRNO, "listen %s", addr);
@@ -132,10 +132,30 @@ static void sighup_handler(int num)
 	static_yaz_proxy->reconfig();
 }
 
+#if HAVE_XSLT
+static void proxy_xml_error_handler(void *ctx, const char *fmt, ...)
+{
+    char buf[1024];
+
+    va_list ap;
+    va_start(ap, fmt);
+
+    vsnprintf(buf, sizeof(buf), fmt, ap);
+
+    yaz_log(LOG_WARN, "%s", buf);
 
-static void child_run(Yaz_SocketManager *m)
+    va_end (ap);
+}
+#endif
+
+static void child_run(Yaz_SocketManager *m, int run)
 {
-    yaz_log(LOG_LOG, "0 proxy pid=%ld", (long) getpid());
+    signal(SIGHUP, sighup_handler);
+
+#if HAVE_XSLT
+    xmlSetGenericErrorFunc(0, proxy_xml_error_handler);
+#endif
+    yaz_log(LOG_LOG, "0 proxy run=%d pid=%ld", run, (long) getpid());
     if (pid_fname)
     {
 	FILE *f = fopen(pid_fname, "w");
@@ -179,20 +199,23 @@ static void child_run(Yaz_SocketManager *m)
 
 int main(int argc, char **argv)
 {
+#if HAVE_XSLT
+    xmlInitMemory();
+    
+    LIBXML_TEST_VERSION
+#endif
     int cont = 1;
-    static int mk_pid = 0;
+    int run = 1;
     Yaz_SocketManager mySocketManager;
     Yaz_Proxy proxy(new Yaz_PDU_Assoc(&mySocketManager));
 
     static_yaz_proxy = &proxy;
 
-    signal(SIGHUP, sighup_handler);
-
     args(&proxy, argc, argv);
 
     if (debug)
     {
-	child_run(&mySocketManager);
+	child_run(&mySocketManager, run);
 	exit(0);
     }
     while (cont)
@@ -205,11 +228,14 @@ int main(int argc, char **argv)
 	}
 	else if (p == 0)
 	{
-	    child_run(&mySocketManager);
+	    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);
@@ -230,9 +256,13 @@ int main(int argc, char **argv)
 		yaz_log(LOG_WARN, "Received SIGSEGV from child %ld", (long) p);
 		cont = 1;
 		break;
+	    case SIGBUS:	
+		yaz_log(LOG_WARN, "Received SIGBUS from child %ld", (long) p);
+		cont = 1;
+		break;
 	    case SIGTERM:
 		yaz_log(LOG_LOG, "Received SIGTERM from child %ld",
-			WTERMSIG(status), (long) p);
+			(long) p);
 		cont = 0;
 		break;
 	    default:
@@ -249,7 +279,8 @@ int main(int argc, char **argv)
 	    cont = 1;
 	}
 	if (cont)
-	    sleep(1);
+	    sleep(1 + run/5);
+	run++;
     }
     exit (0);
     return 0;