Log libxml2/libxslt errors in yaz_log

[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 62b478f..614dfa0 100644 (file)
--- 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.28 2004-01-06 21:17:42 adam Exp $
+ * $Id: yaz-proxy-main.cpp,v 1.31 2004-01-30 01:30:30 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,15 +199,18 @@ 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;
-    static int mk_pid = 0;
     Yaz_SocketManager mySocketManager;
     Yaz_Proxy proxy(new Yaz_PDU_Assoc(&mySocketManager));
 
     static_yaz_proxy = &proxy;
 
-
     args(&proxy, argc, argv);
 
     if (debug)
@@ -236,7 +258,7 @@ int main(int argc, char **argv)
                break;
            case SIGTERM:
                yaz_log(LOG_LOG, "Received SIGTERM from child %ld",
-                       WTERMSIG(status), (long) p);
+                       (long) p);
                cont = 0;
                break;
            default: