Make MODS v2 default

[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..8c7c32e 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.33 2004-02-12 17:17:31 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>
 
@@ -182,7 +187,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,6 +194,12 @@ 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 get limit NOFILE cur=%d max=%d",
+               limit_data.rlim_cur, limit_data.rlim_max);
+#endif
 
     while (m->processEvent() > 0)
        ;
@@ -256,6 +266,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 +289,7 @@ int main(int argc, char **argv)
            cont = 1;
        }
        if (cont)
-           sleep(1);
+           sleep(1 + run/5);
        run++;
     }
     exit (0);