From 5076e32b1de695dc3e7b9509c9b05104b01a5f90 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Thu, 21 Feb 2008 09:33:22 +0000 Subject: [PATCH] Using yaz_daemon rather than own code. Fixed bug #2060. Added option -D for yazproxy which puts yazproxy in background after startup. Fixed bug #2060: Killing yazproxy parent does not kill the child as well. Documentation for yazproxy man pages updated. --- NEWS | 5 ++ configure.ac | 4 +- doc/yaz-proxy-ref.xml | 8 +++ src/yaz-proxy-main.cpp | 138 +++++------------------------------------------- src/yaz-proxy.cpp | 3 +- 5 files changed, 30 insertions(+), 128 deletions(-) diff --git a/NEWS b/NEWS index 7c21877..f3878c9 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,8 @@ +Added option -D for yazproxy which puts yazproxy in background after +startup. + +Fixed bug #2060: Killing yazproxy parent does not kill the child as well. + --- 1.3.1 2007/12/27 Fixed bug #1989: For PQF SRU one char is stipped off query. diff --git a/configure.ac b/configure.ac index de3cbcf..ba8630f 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ dnl yazproxy, Index Data 1994-2007 dnl See the file LICENSE for details. -dnl $Id: configure.ac,v 1.18 2008-01-24 21:51:40 adam Exp $ +dnl $Id: configure.ac,v 1.19 2008-02-21 09:33:22 adam Exp $ AC_PREREQ(2.60) AC_INIT([yazproxy],[1.3.1],[adam@indexdata.dk]) AC_CONFIG_SRCDIR(configure.ac) @@ -21,7 +21,7 @@ YAZ_DOC USEMARCON_INIT AC_CHECK_FUNCS(setrlimit getrlimit gettimeofday) -AC_CHECK_HEADERS(pwd.h sys/resource.h sys/stat.h sys/time.h sys/types.h sys/wait.h unistd.h) +AC_CHECK_HEADERS(sys/resource.h sys/stat.h sys/time.h sys/types.h unistd.h) AC_CHECK_LIB(dl,dlopen) dnl AC_SUBST(YAZPROXY_SRC_ROOT) diff --git a/doc/yaz-proxy-ref.xml b/doc/yaz-proxy-ref.xml index fc831f3..77c66bd 100644 --- a/doc/yaz-proxy-ref.xml +++ b/doc/yaz-proxy-ref.xml @@ -11,6 +11,7 @@ yazproxy -a filename -c config + -D -i seconds -l filename -m num @@ -66,6 +67,13 @@ libxml2. + -X + + Puts YAZ proxy in the background after startup. This is + similar to using shell's & operator but often better since + it allows the start / stop script to capture startup errors. + + -i seconds Specifies in seconds the idle time for communication between diff --git a/src/yaz-proxy-main.cpp b/src/yaz-proxy-main.cpp index aa6b7c0..88b106a 100644 --- a/src/yaz-proxy-main.cpp +++ b/src/yaz-proxy-main.cpp @@ -1,4 +1,4 @@ -/* $Id: yaz-proxy-main.cpp,v 1.21 2007-10-08 11:47:21 adam Exp $ +/* $Id: yaz-proxy-main.cpp,v 1.22 2008-02-21 09:33:23 adam Exp $ Copyright (c) 1998-2006, Index Data. This file is part of the yazproxy. @@ -29,21 +29,16 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #if HAVE_SYS_TIME_H #include #endif -#if HAVE_SYS_WAIT_H -#include -#endif #if HAVE_SYS_RESOURCE_H #include #endif -#if HAVE_PWD_H -#include -#endif #include #include #include #include +#include #include #include @@ -64,7 +59,7 @@ using namespace yazpp_1; void usage(char *prog) { - fprintf (stderr, "%s: [-a log] [-c config]\n" + fprintf (stderr, "%s: [-a log] [-c config] [-D]\n" " [-i sec] [-l log] [-m num] [-n num] [-p pidfile]" " [-t target] [-T sec] [-u uid]\n" " [-v level] [-X] @:port\n", prog); @@ -74,7 +69,7 @@ void usage(char *prog) static char *pid_fname = 0; static char *uid = 0; static char *log_file = 0; -static int debug = 0; +static unsigned int daemon_flags = YAZ_DAEMON_KEEPALIVE; static int no_limit_files = 0; int args(Yaz_Proxy *proxy, int argc, char **argv) @@ -84,7 +79,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:n:X", + while ((ret = options("o:a:Dt:v:c:u:i:m:l:T:p:n:X", argv, argc, &arg)) != -2) { int err; @@ -114,6 +109,9 @@ int args(Yaz_Proxy *proxy, int argc, char **argv) exit(1); } break; + case 'D': + daemon_flags |= YAZ_DAEMON_FORK; + break; case 'i': proxy->set_client_idletime(atoi(arg)); break; @@ -149,7 +147,7 @@ int args(Yaz_Proxy *proxy, int argc, char **argv) break; case 'X': proxy->set_debug_mode(1); - debug = 1; + daemon_flags = YAZ_DAEMON_DEBUG; break; default: usage(prog); @@ -202,8 +200,9 @@ static void proxy_xml_error_handler(void *ctx, const char *fmt, ...) } #endif -static void child_run(SocketManager *m, int run) +static void child_run(void *data) { + SocketManager *m = (SocketManager *) data; #ifdef WIN32 #else signal(SIGHUP, sighup_handler); @@ -219,7 +218,7 @@ static void child_run(SocketManager *m, int run) #endif #ifdef WIN32 #else - yaz_log(YLOG_LOG, "0 proxy run=%d pid=%ld", run, (long) getpid()); + yaz_log(YLOG_LOG, "0 proxy pid=%ld", (long) getpid()); #endif if (no_limit_files) { @@ -236,42 +235,6 @@ static void child_run(SocketManager *m, int run) yaz_log(YLOG_WARN, "setrlimit unavablable. Option -n ignored"); #endif } -#ifdef WIN32 -#else - if (pid_fname) - { - FILE *f = fopen(pid_fname, "w"); - if (!f) - { - yaz_log(YLOG_ERRNO|YLOG_FATAL, "Couldn't create %s", pid_fname); - exit(0); - } - fprintf(f, "%ld", (long) getpid()); - fclose(f); - xfree(pid_fname); - } - if (uid) - { - struct passwd *pw; - - if (!(pw = getpwnam(uid))) - { - yaz_log(YLOG_FATAL, "%s: Unknown user", uid); - exit(3); - } - if (log_file) - { - chown(log_file, pw->pw_uid, pw->pw_gid); - xfree(log_file); - } - if (setuid(pw->pw_uid) < 0) - { - yaz_log(YLOG_FATAL|YLOG_ERRNO, "setuid"); - exit(4); - } - xfree(uid); - } -#endif #if HAVE_GETRLIMIT struct rlimit limit_data; getrlimit(RLIMIT_NOFILE, &limit_data); @@ -292,8 +255,6 @@ int main(int argc, char **argv) LIBXML_TEST_VERSION #endif - int cont = 1; - int run = 1; SocketManager mySocketManager; Yaz_Proxy proxy(new PDU_Assoc(&mySocketManager), &mySocketManager); @@ -301,79 +262,8 @@ int main(int argc, char **argv) args(&proxy, argc, argv); -#ifdef WIN32 - child_run(&mySocketManager, run); -#else - if (debug) - { - child_run(&mySocketManager, run); - exit(0); - } - while (cont) - { - pid_t p = fork(); - if (p == (pid_t) -1) - { - yaz_log(YLOG_FATAL|YLOG_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(YLOG_FATAL, "p1=%d != p=%d", p1, p); - exit(1); - } - if (WIFSIGNALED(status)) - { - switch(WTERMSIG(status)) { - case SIGILL: - yaz_log(YLOG_WARN, "Received SIGILL from child %ld", (long) p); - cont = 1; - break; - case SIGABRT: - yaz_log(YLOG_WARN, "Received SIGABRT from child %ld", (long) p); - cont = 1; - break ; - case SIGSEGV: - yaz_log(YLOG_WARN, "Received SIGSEGV from child %ld", (long) p); - cont = 1; - break; - case SIGBUS: - yaz_log(YLOG_WARN, "Received SIGBUS from child %ld", (long) p); - cont = 1; - break; - case SIGTERM: - yaz_log(YLOG_LOG, "Received SIGTERM from child %ld", - (long) p); - cont = 0; - break; - default: - yaz_log(YLOG_WARN, "Received SIG %d from child %ld", - WTERMSIG(status), (long) p); - cont = 0; - } - } - else if (status == 0) - cont = 0; - else - { - yaz_log(YLOG_LOG, "Exit %d from child %ld", status, (long) p); - cont = 1; - } - if (cont) - sleep(1 + run/5); - run++; - } -#endif + yaz_daemon("yazproxy", daemon_flags, + child_run, &mySocketManager, pid_fname, uid); exit (0); return 0; } diff --git a/src/yaz-proxy.cpp b/src/yaz-proxy.cpp index a9ca482..258c5b4 100644 --- a/src/yaz-proxy.cpp +++ b/src/yaz-proxy.cpp @@ -1,4 +1,4 @@ -/* $Id: yaz-proxy.cpp,v 1.77 2007-05-08 12:05:09 adam Exp $ +/* $Id: yaz-proxy.cpp,v 1.78 2008-02-21 09:33:23 adam Exp $ Copyright (c) 1998-2007, Index Data. This file is part of the yazproxy. @@ -399,7 +399,6 @@ Yaz_ProxyConfig *Yaz_Proxy::check_reconfigure() if (m_reconfig_flag) { yaz_log(YLOG_LOG, "reconfigure"); - yaz_log_reopen(); if (m_config_fname && cfg) { yaz_log(YLOG_LOG, "reconfigure config %s", m_config_fname); -- 1.7.10.4