Changeset 1957

Timestamp:

08/21/2007 05:40:03 PM (14 months ago)

Author:

jan

Message:

added sending UID and PID for SIGTERM and SIGINT to the logs

Location:

branches/lighttpd-1.4.x

Files:

• NEWS (modified) (1 diff)
• src/log.c (modified) (1 diff)
• src/server.c (modified) (3 diffs)

branches/lighttpd-1.4.x/NEWS

@@ -6 +6 @@
 - 1.4.17 -
   * added dir-listing.set-footer in mod_dirlisting (#1277)
+  * added sending UID and PID for SIGTERM and SIGINT to the logs
   * fixed hardcoded font-sizes in mod_dirlisting (#1267)
   * fixed different ETag length on 32/64 platforms (#1279)

branches/lighttpd-1.4.x/src/log.c

@@ -127 +127 @@
         }
 
-        log_error_write(srv, __FILE__, __LINE__, "s", "logfiles cycled");
-
         return 0;
 }
 
 int log_error_close(server *srv) {
-        log_error_write(srv, __FILE__, __LINE__, "s", "server stopped");
-
         switch(srv->errorlog_mode) {
         case ERRORLOG_FILE:

branches/lighttpd-1.4.x/src/server.c

@@ -71 +71 @@
 
 #if defined(HAVE_SIGACTION) && defined(SA_SIGINFO)
+static volatile siginfo_t last_sigterm_info;
+static volatile siginfo_t last_sighup_info;
+
 static void sigaction_handler(int sig, siginfo_t *si, void *context) {
-        UNUSED(si);
         UNUSED(context);
 
         switch (sig) {
-        case SIGTERM: srv_shutdown = 1; break;
+        case SIGTERM:
+                srv_shutdown = 1;
+                memcpy(&last_sigterm_info, si, sizeof(*si));
+                break;
         case SIGINT:
-             if (graceful_shutdown) srv_shutdown = 1;
-             else graceful_shutdown = 1;
-
-             break;
-        case SIGALRM: handle_sig_alarm = 1; break;
-        case SIGHUP:  handle_sig_hup = 1; break;
-        case SIGCHLD: break;
+                if (graceful_shutdown) {
+                        srv_shutdown = 1;
+                } else {
+                        graceful_shutdown = 1;
+                }
+                memcpy(&last_sigterm_info, si, sizeof(*si));
+
+                break;
+        case SIGALRM: 
+                handle_sig_alarm = 1; 
+                break;
+        case SIGHUP:
+                handle_sig_hup = 1;
+                memcpy(&last_sighup_info, si, sizeof(*si));
+                break;
+        case SIGCHLD:
+                break;
         }
 }
@@ -1080 +1095 @@
 
                                 return -1;
+                        } else {
+#ifdef HAVE_SIGACTION
+                                log_error_write(srv, __FILE__, __LINE__, "sdsd", 
+                                        "logfiles cycled UID =",
+                                        last_sigterm_info.si_uid,
+                                        "PID =",
+                                        last_sigterm_info.si_pid);
+#else
+                                log_error_write(srv, __FILE__, __LINE__, "s", 
+                                        "logfiles cycled");
+#endif
                         }
                 }
@@ -1379 +1405 @@
         }
 
+#ifdef HAVE_SIGACTION
+        log_error_write(srv, __FILE__, __LINE__, "sdsd", 
+                        "server stopped by UID =",
+                        last_sigterm_info.si_uid,
+                        "PID =",
+                        last_sigterm_info.si_pid);
+#else
+        log_error_write(srv, __FILE__, __LINE__, "s", 
+                        "server stopped");
+#endif
+
         /* clean-up */
         log_error_close(srv);