X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fdaemon.c;h=c72aa302f82ec74f0578e23370619f3d53b2e726;hp=f9d663aef228ae0ae520da780134aee654e97bf5;hb=fdbc68116e40436502229bbbabec0c3d6b9da378;hpb=2dbe1df5facb92bac31b5da0ca2e2e8ee6f9b358

diff --git a/src/daemon.c b/src/daemon.c
index f9d663a..c72aa30 100644
--- a/src/daemon.c
+++ b/src/daemon.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2008, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2012 Index Data
  * See the file LICENSE for details.
- *
- * $Id: daemon.c,v 1.2 2008-02-21 10:15:30 adam Exp $
  */
 
 /**
@@ -21,15 +19,12 @@
 #include <unistd.h>
 #endif
 #include <stdlib.h>
-#include <signal.h>
 #if HAVE_SYS_WAIT_H
 #include <sys/wait.h>
 #endif
 
+#if HAVE_SYS_TYPES_H
 #include <sys/types.h>
-
-#if HAVE_SYS_STAT_H
-#include <sys/stat.h>
 #endif
 
 #include <fcntl.h>
@@ -38,6 +33,10 @@
 #include <pwd.h>
 #endif
 
+#if HAVE_SYS_PRCTL_H
+#include <sys/prctl.h>
+#endif
+
 #include <yaz/daemon.h>
 #include <yaz/log.h>
 #include <yaz/snprintf.h>
@@ -54,7 +53,7 @@ static void write_pidfile(int pid_fd)
             yaz_log(YLOG_FATAL|YLOG_ERRNO, "ftruncate");
             exit(1);
         }
-        if (write(pid_fd, buf, strlen(buf)) != strlen(buf))
+        if (write(pid_fd, buf, strlen(buf)) != (int) strlen(buf))
         {
             yaz_log(YLOG_FATAL|YLOG_ERRNO, "write");
             exit(1);
@@ -63,11 +62,31 @@ static void write_pidfile(int pid_fd)
     }
 }
 
+int child_got_signal_from_us = 0;
 pid_t child_pid = 0;
-static void kill_child_handler(int num)
+static void normal_stop_handler(int num)
+{
+    if (child_pid)
+    {
+        /* tell child to terminate . ensure keepalive stops running -
+           let wait(2) wait once - so we exit AFTER the child */
+        child_got_signal_from_us = 1;
+        kill(child_pid, num);
+    }
+}
+
+static void graceful_stop_handler(int num)
 {
     if (child_pid)
+    {
+        /* tell our child to stop listening and wait some in time
+           in the hope that it has stopped listening by then. Then
+           we exit - quite possibly the child is still running - serving
+           remaining requests */
         kill(child_pid, num);
+        sleep(2);
+        _exit(0);
+    }
 }
 
 static void keepalive(void (*work)(void *data), void *data)
@@ -76,13 +95,15 @@ static void keepalive(void (*work)(void *data), void *data)
     int cont = 1;
     void (*old_sighup)(int);
     void (*old_sigterm)(int);
+    void (*old_sigusr1)(int);
     
     /* keep signals in their original state and make sure that some signals
        to parent process also gets sent to the child.. 
     */
-    old_sighup = signal(SIGHUP, kill_child_handler);
-    old_sigterm = signal(SIGTERM, kill_child_handler);
-    while (cont)
+    old_sighup = signal(SIGHUP, normal_stop_handler);
+    old_sigterm = signal(SIGTERM, normal_stop_handler);
+    old_sigusr1 = signal(SIGUSR1, graceful_stop_handler);
+    while (cont && !child_got_signal_from_us)
     {
         pid_t p = fork();
         pid_t p1;
@@ -98,6 +119,7 @@ static void keepalive(void (*work)(void *data), void *data)
                 /* child */
             signal(SIGHUP, old_sighup);  /* restore */
             signal(SIGTERM, old_sigterm);/* restore */
+            signal(SIGUSR1, old_sigusr1);/* restore */
             
             work(data);
             exit(0);
@@ -146,17 +168,17 @@ static void keepalive(void (*work)(void *data), void *data)
                 yaz_log(YLOG_WARN, "Received SIG %d from child %ld",
                         WTERMSIG(status), (long) p);
                 cont = 0;
-                }
-            }
-            else if (status == 0)
-                cont = 0; /* child exited normally */
-            else
-            {   /* child exited with error */
-                yaz_log(YLOG_LOG, "Exit %d from child %ld", status, (long) p);
-                cont = 0;
             }
+        }
+        else if (status == 0)
+            cont = 0; /* child exited normally */
+        else
+        {   /* child exited with error */
+            yaz_log(YLOG_LOG, "Exit %d from child %ld", status, (long) p);
+            cont = 0;
+        }
         if (cont) /* respawn slower as we get more errors */
-                sleep(1 + run/5);
+            sleep(1 + run/5);
         run++;
     }
 }
@@ -204,6 +226,13 @@ int yaz_daemon(const char *progname,
             yaz_log(YLOG_FATAL|YLOG_ERRNO, "setuid");
             exit(1);
         }
+        /* Linux don't produce core dumps evern if the limit is right and
+           files are writable.. This fixes this. See prctl(2) */
+#if HAVE_SYS_PRCTL_H
+#ifdef PR_SET_DUMPABLE
+        prctl(PR_SET_DUMPABLE, 1, 0, 0);
+#endif
+#endif
     }
 
     if (flags & YAZ_DAEMON_FORK)
@@ -248,7 +277,10 @@ int yaz_daemon(const char *progname,
         close(1);
         close(2);
         open("/dev/null", O_RDWR);
-        dup(0); dup(0);
+        if (dup(0) == -1)
+            return 1;
+        if (dup(0) == -1)
+            return 1;
         close(hand[1]);
     }
 
@@ -272,7 +304,9 @@ int yaz_daemon(const char *progname,
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */
+