Log XSLT errors to 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 06df98e..ae041d1 100644 (file)
--- a/src/yaz-proxy-main.cpp
+++ b/src/yaz-proxy-main.cpp
@@ -2,13 +2,19 @@
  * 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.35 2004-03-17 10:49:58 adam Exp $
  */
 
 #include <signal.h>
 #include <unistd.h>
 #include <pwd.h>
 #include <sys/types.h>
+#include <stdarg.h>
+
+#if HAVE_GETRLIMIT
+#include <sys/time.h>
+#include <sys/resource.h>
+#endif
 
 #include <yaz/log.h>
 #include <yaz/options.h>
@@ -28,6 +34,7 @@ static char *pid_fname = 0;
 static char *uid = 0;
 static char *log_file = 0;
 static int debug = 0;
+static int no_limit_files = 0;
 
 int args(Yaz_Proxy *proxy, int argc, char **argv)
 {
@@ -36,7 +43,7 @@ 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:X",
+    while ((ret = options("o:a:t:v:c:u:i:m:l:T:p:U:n:X",
                          argv, argc, &arg)) != -2)
     {
        int err;
@@ -91,6 +98,9 @@ int args(Yaz_Proxy *proxy, int argc, char **argv)
         case 'T':
            proxy->set_target_idletime(atoi(arg));
            break;
+       case 'n':
+           no_limit_files = atoi(arg);
+           break;
        case 'X':
            debug = 1;
            break;
@@ -109,7 +119,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 +141,47 @@ 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: %s", (char*) ctx, 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((void *) "XML", proxy_xml_error_handler);
+    xsltSetGenericErrorFunc((void *) "XSLT", proxy_xml_error_handler);
+#endif
+    yaz_log(LOG_LOG, "0 proxy run=%d pid=%ld", run, (long) getpid());
+
+    if (no_limit_files)
+    {
+#if HAVE_SETRLIMIT
+       struct rlimit limit_data;
+       limit_data.rlim_cur = no_limit_files;
+       limit_data.rlim_max = no_limit_files;
+       
+       yaz_log(LOG_LOG, "0 setrlimit NOFILE cur=%d max=%d",
+               limit_data.rlim_cur, limit_data.rlim_max);
+       if (setrlimit(RLIMIT_NOFILE, &limit_data))
+           yaz_log(LOG_ERRNO|LOG_WARN, "setrlimit");
+#else
+       yaz_log(LOG_WARN, "setrlimit unavablable. Option -n ignored");
+#endif
+    }
     if (pid_fname)
     {
        FILE *f = fopen(pid_fname, "w");
@@ -162,7 +208,6 @@ static void child_run(Yaz_SocketManager *m)
            chown(log_file, pw->pw_uid,  pw->pw_gid);
            xfree(log_file);
        }
-
        if (setuid(pw->pw_uid) < 0)
        {
            yaz_log(LOG_FATAL|LOG_ERRNO, "setuid");
@@ -170,7 +215,13 @@ static void child_run(Yaz_SocketManager *m)
        }
        xfree(uid);
     }
-
+#if HAVE_GETRLIMIT
+    struct rlimit limit_data;
+    getrlimit(RLIMIT_NOFILE, &limit_data);
+    yaz_log(LOG_LOG, "0 getrlimit NOFILE cur=%d max=%d",
+           limit_data.rlim_cur, limit_data.rlim_max);
+#endif
+    
     while (m->processEvent() > 0)
        ;
 
@@ -179,20 +230,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 +259,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 +287,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 +310,8 @@ int main(int argc, char **argv)
            cont = 1;
        }
        if (cont)
-           sleep(1);
+           sleep(1 + run/5);
+       run++;
     }
     exit (0);
     return 0;