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

diff --git a/src/yaz-proxy-main.cpp b/src/yaz-proxy-main.cpp
index 21796f6..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.29 2004-01-07 13:40:06 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>
@@ -131,11 +132,29 @@ 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);
+
+    va_end (ap);
+}
+#endif
 
 static void child_run(Yaz_SocketManager *m, int run)
 {
     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)
     {
@@ -180,6 +199,11 @@ static void child_run(Yaz_SocketManager *m, int run)
 
 int main(int argc, char **argv)
 {
+#if HAVE_XSLT
+    xmlInitMemory();
+    
+    LIBXML_TEST_VERSION
+#endif
     int cont = 1;
     int run = 1;
     Yaz_SocketManager mySocketManager;
@@ -187,7 +211,6 @@ int main(int argc, char **argv)
 
     static_yaz_proxy = &proxy;
 
-
     args(&proxy, argc, argv);
 
     if (debug)
@@ -233,6 +256,10 @@ 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",
 			(long) p);
@@ -252,7 +279,7 @@ int main(int argc, char **argv)
 	    cont = 1;
 	}
 	if (cont)
-	    sleep(1);
+	    sleep(1 + run/5);
 	run++;
     }
     exit (0);