Log when we receive SIGTERM

Log reception of SIGTERM and exit relatively gracefully
bukzor · Nov 25, 2015 · ae8e197 · ae8e197
1 parent fbab997
commit ae8e197
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 10 deletions.
diff --git a/listener.c b/listener.c
@@ -405,6 +405,17 @@ w_root_t *resolve_root_or_err(
  return root;
 }
 
+void w_request_shutdown(void) {
+ stopping = true;
+ // Knock listener thread out of poll/accept
+#ifndef _WIN32
+ pthread_kill(listener_thread, SIGUSR1);
+ pthread_kill(reaper_thread, SIGUSR1);
+#else
+ SetEvent(listener_thread_event);
+#endif
+}
+
 static void cmd_shutdown(
  struct watchman_client *client,
  json_t *args)
@@ -415,13 +426,7 @@ static void cmd_shutdown(
  w_log(W_LOG_ERR, "shutdown-server was requested, exiting!\n");
  stopping = true;
 
- // Knock listener thread out of poll/accept
-#ifndef _WIN32
- pthread_kill(listener_thread, SIGUSR1);
- pthread_kill(reaper_thread, SIGUSR1);
-#else
- SetEvent(listener_thread_event);
-#endif
+ w_request_shutdown();
 
  set_prop(resp, "shutdown-server", json_true());
  send_and_dispose_response(client, resp);

diff --git a/log.c b/log.c
@@ -74,8 +74,16 @@ static void crash_handler(int signo, siginfo_t *si, void *ucontext) {
  }
  }
 
- dprintf(STDERR_FILENO, "Terminating due to signal %d %s. %s (%p)\n",
- signo, sys_siglist[signo], reason, si ? si->si_value.sival_ptr : NULL);
+ if (si) {
+ dprintf(STDERR_FILENO,
+ "Terminating due to signal %d %s "
+ "generated by pid=%d uid=%d. %s (%p)\n",
+ signo, sys_siglist[signo], si->si_pid, si->si_uid,
+ reason, si->si_value.sival_ptr);
+ } else {
+ dprintf(STDERR_FILENO, "Terminating due to signal %d %s. %s\n",
+ signo, sys_siglist[signo], reason);
+ }
 
 #if defined(HAVE_BACKTRACE) && defined(HAVE_BACKTRACE_SYMBOLS_FD)
  {
@@ -84,6 +92,10 @@ static void crash_handler(int signo, siginfo_t *si, void *ucontext) {
  backtrace_symbols_fd(array, size, STDERR_FILENO);
  }
 #endif
+ if (signo == SIGTERM) {
+ w_request_shutdown();
+ return;
+ }
  abort();
 }
 #endif
@@ -102,6 +114,7 @@ void w_setup_signal_handlers(void) {
 #endif
  sigaction(SIGFPE, &sa, NULL);
  sigaction(SIGILL, &sa, NULL);
+ sigaction(SIGTERM, &sa, NULL);
 #endif
 }
 

diff --git a/tests/log.c b/tests/log.c
@@ -4,6 +4,8 @@
 #include "watchman.h"
 #include "thirdparty/tap.h"
 
+void w_request_shutdown(void) {}
+
 bool w_should_log_to_clients(int level)
 {
  unused_parameter(level);
@@ -38,4 +40,3 @@ int main(int argc, char **argv)
 
 /* vim:ts=2:sw=2:et:
  */
-
diff --git a/watchman.h b/watchman.h
@@ -605,6 +605,7 @@ void w_log(int level, WATCHMAN_FMT_STRING(const char *fmt), ...)
  __attribute__((format(printf, 2, 3)))
 #endif
 ;
+void w_request_shutdown(void);
 
 bool w_should_log_to_clients(int level);
 void w_log_to_clients(int level, const char *buf);