projects
/
yazpp-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Log max/cur files using getrlimit
[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
..
8c7c32e
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.
*
* 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.33 2004-02-12 17:17:31 adam Exp $
*/
#include <signal.h>
#include <unistd.h>
#include <pwd.h>
#include <sys/types.h>
*/
#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>
#include <yaz/log.h>
#include <yaz/options.h>
@@
-131,11
+137,29
@@
static void sighup_handler(int num)
static_yaz_proxy->reconfig();
}
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);
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)
{
yaz_log(LOG_LOG, "0 proxy run=%d pid=%ld", run, (long) getpid());
if (pid_fname)
{
@@
-163,7
+187,6
@@
static void child_run(Yaz_SocketManager *m, int run)
chown(log_file, pw->pw_uid, pw->pw_gid);
xfree(log_file);
}
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");
if (setuid(pw->pw_uid) < 0)
{
yaz_log(LOG_FATAL|LOG_ERRNO, "setuid");
@@
-171,6
+194,12
@@
static void child_run(Yaz_SocketManager *m, int run)
}
xfree(uid);
}
}
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)
;
while (m->processEvent() > 0)
;
@@
-180,15
+209,18
@@
static void child_run(Yaz_SocketManager *m, int run)
int main(int argc, char **argv)
{
int main(int argc, char **argv)
{
+#if HAVE_XSLT
+ xmlInitMemory();
+
+ LIBXML_TEST_VERSION
+#endif
int cont = 1;
int run = 1;
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;
Yaz_SocketManager mySocketManager;
Yaz_Proxy proxy(new Yaz_PDU_Assoc(&mySocketManager));
static_yaz_proxy = &proxy;
-
args(&proxy, argc, argv);
if (debug)
args(&proxy, argc, argv);
if (debug)
@@
-234,9
+266,13
@@
int main(int argc, char **argv)
yaz_log(LOG_WARN, "Received SIGSEGV from child %ld", (long) p);
cont = 1;
break;
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",
case SIGTERM:
yaz_log(LOG_LOG, "Received SIGTERM from child %ld",
- WTERMSIG(status), (long) p);
+ (long) p);
cont = 0;
break;
default:
cont = 0;
break;
default:
@@
-253,7
+289,7
@@
int main(int argc, char **argv)
cont = 1;
}
if (cont)
cont = 1;
}
if (cont)
- sleep(1);
+ sleep(1 + run/5);
run++;
}
exit (0);
run++;
}
exit (0);