X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fyaz-proxy-main.cpp;h=98c93ccbbabdb9a403d39fa43a71655b8ab39974;hb=d3d51bee2100324025f7530d4e3ff3502397fd83;hp=af6428369bd2658994e9889de2cc070f9cee3d6f;hpb=7b05ec98b5a3227967c82f601a1c06ffd5c6dee6;p=yazpp-moved-to-github.git diff --git a/src/yaz-proxy-main.cpp b/src/yaz-proxy-main.cpp index af64283..98c93cc 100644 --- a/src/yaz-proxy-main.cpp +++ b/src/yaz-proxy-main.cpp @@ -1,14 +1,20 @@ /* - * Copyright (c) 1998-2003, Index Data. + * Copyright (c) 1998-2004, Index Data. * See the file LICENSE for details. * - * $Id: yaz-proxy-main.cpp,v 1.23 2003-10-23 12:14:48 adam Exp $ + * $Id: yaz-proxy-main.cpp,v 1.34 2004-02-16 10:47:37 adam Exp $ */ #include #include #include #include +#include + +#if HAVE_GETRLIMIT +#include +#include +#endif #include #include @@ -19,14 +25,16 @@ void usage(char *prog) { - fprintf (stderr, "%s: [-c config] [-a log] [-m num] [-v level] [-t target] [-i sec] " - "[-u uid] [-p pidfile] [-o optlevel] @:port\n", prog); + fprintf (stderr, "%s: [-c config] [-l log] [-a log] [-v level] [-t target] " + "[-u uid] [-p pidfile] @:port\n", prog); exit (1); } 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) { @@ -35,7 +43,8 @@ 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:", argv, argc, &arg)) != -2) + while ((ret = options("o:a:t:v:c:u:i:m:l:T:p:U:n:X", + argv, argc, &arg)) != -2) { int err; switch (ret) @@ -89,6 +98,12 @@ 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; case 'p': if (!pid_fname) pid_fname = xstrdup(arg); @@ -121,22 +136,51 @@ int args(Yaz_Proxy *proxy, int argc, char **argv) static Yaz_Proxy *static_yaz_proxy = 0; static void sighup_handler(int num) { + signal(SIGHUP, sighup_handler); if (static_yaz_proxy) static_yaz_proxy->reconfig(); } -int main(int argc, char **argv) +#if HAVE_XSLT +static void proxy_xml_error_handler(void *ctx, const char *fmt, ...) { - static int mk_pid = 0; - Yaz_SocketManager mySocketManager; - Yaz_Proxy proxy(new Yaz_PDU_Assoc(&mySocketManager)); + char buf[1024]; - static_yaz_proxy = &proxy; + 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); - args(&proxy, argc, argv); +#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 @@ int main(int argc, char **argv) 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,10 +214,104 @@ int main(int argc, char **argv) } xfree(uid); } - - while (mySocketManager.processEvent() > 0) +#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) ; exit (0); +} + +int main(int argc, char **argv) +{ +#if HAVE_XSLT + xmlInitMemory(); + + LIBXML_TEST_VERSION +#endif + int cont = 1; + int run = 1; + Yaz_SocketManager mySocketManager; + Yaz_Proxy proxy(new Yaz_PDU_Assoc(&mySocketManager)); + + static_yaz_proxy = &proxy; + + args(&proxy, argc, argv); + + if (debug) + { + child_run(&mySocketManager, run); + exit(0); + } + while (cont) + { + pid_t p = fork(); + if (p == (pid_t) -1) + { + yaz_log(LOG_FATAL|LOG_ERRNO, "fork"); + exit(1); + } + else if (p == 0) + { + 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); + exit(1); + } + if (WIFSIGNALED(status)) + { + switch(WTERMSIG(status)) { + case SIGILL: + yaz_log(LOG_WARN, "Received SIGILL from child %ld", (long) p); + cont = 1; + break; + case SIGABRT: + yaz_log(LOG_WARN, "Received SIGABRT from child %ld", (long) p); + cont = 1; + break ; + case SIGSEGV: + 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); + cont = 0; + break; + default: + yaz_log(LOG_WARN, "Received SIG %d from child %ld", + WTERMSIG(status), (long) p); + cont = 0; + } + } + else if (status == 0) + cont = 0; + else + { + yaz_log(LOG_LOG, "Exit %d from child %ld", status, (long) p); + cont = 1; + } + if (cont) + sleep(1 + run/5); + run++; + } + exit (0); return 0; }