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 614dfa0..ae041d1 100644 (file)
--- a/src/yaz-proxy-main.cpp
+++ b/src/yaz-proxy-main.cpp
@@ -2,7 +2,7 @@
  * Copyright (c) 1998-2004, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: yaz-proxy-main.cpp,v 1.31 2004-01-30 01:30:30 adam Exp $
+ * $Id: yaz-proxy-main.cpp,v 1.35 2004-03-17 10:49:58 adam Exp $
  */
 
 #include <signal.h>
@@ -11,6 +11,11 @@
 #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>
 
@@ -29,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)
 {
@@ -37,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;
@@ -92,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;
@@ -142,7 +151,7 @@ static void proxy_xml_error_handler(void *ctx, const char *fmt, ...)
 
     vsnprintf(buf, sizeof(buf), fmt, ap);
 
-    yaz_log(LOG_WARN, "%s", buf);
+    yaz_log(LOG_WARN, "%s: %s", (char*) ctx, buf);
 
     va_end (ap);
 }
@@ -153,9 +162,26 @@ static void child_run(Yaz_SocketManager *m, int run)
     signal(SIGHUP, sighup_handler);
 
 #if HAVE_XSLT
-    xmlSetGenericErrorFunc(0, proxy_xml_error_handler);
+    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");
@@ -182,7 +208,6 @@ static void child_run(Yaz_SocketManager *m, int run)
            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");
@@ -190,7 +215,13 @@ static void child_run(Yaz_SocketManager *m, int run)
        }
        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)
        ;
 
@@ -256,6 +287,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);
@@ -275,7 +310,7 @@ int main(int argc, char **argv)
            cont = 1;
        }
        if (cont)
-           sleep(1);
+           sleep(1 + run/5);
        run++;
     }
     exit (0);