X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fyaz-proxy-main.cpp;h=98c93ccbbabdb9a403d39fa43a71655b8ab39974;hb=d3d51bee2100324025f7530d4e3ff3502397fd83;hp=4a7a9b78f1c319d7593bd38aeb4c118616bdc21a;hpb=30c77a56e7ce7a6c5a9c98c4149f1df3a1db1b31;p=yazpp-moved-to-github.git

diff --git a/src/yaz-proxy-main.cpp b/src/yaz-proxy-main.cpp
index 4a7a9b7..98c93cc 100644
--- 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.30 2004-01-12 22:35:26 adam Exp $
+ * $Id: yaz-proxy-main.cpp,v 1.34 2004-02-16 10:47:37 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;
@@ -131,12 +141,46 @@ 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 (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");
@@ -163,7 +207,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");
@@ -171,7 +214,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)
 	;
 
@@ -237,6 +286,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);
@@ -256,7 +309,7 @@ int main(int argc, char **argv)
 	    cont = 1;
 	}
 	if (cont)
-	    sleep(1);
+	    sleep(1 + run/5);
 	run++;
     }
     exit (0);