(main, empth_start): Don't bother to catch SIGUSR1. Use SIGINT or

SIGTERM to shutdown the server.

diff --git a/src/lib/empthread/pthread.c b/src/lib/empthread/pthread.c
index 301f962178e74a4ac5cedb0bbc88285a14d43352..c4ce9989ffbc76f7baa21265f58611fb0a08b0cc 100644 (file)
--- a/src/lib/empthread/pthread.c
+++ b/src/lib/empthread/pthread.c
@@ -67,11 +67,6 @@ empth_start(void *ctx)
     /* actually it should inherit all this from main but... */
     sigemptyset(&act.sa_mask);
     act.sa_handler = shutdwn;
-    /* pthreads on Linux use SIGUSR1 (*shrug*) so only catch it if not on
-       a Linux box running POSIX threads -- STM */
-#if !(defined(__linux__) && defined(_EMPTH_POSIX))
-    sigaction(SIGUSR1, &act, NULL);
-#endif
     sigaction(SIGTERM, &act, NULL);
     sigaction(SIGINT, &act, NULL);
     act.sa_handler = panic;

diff --git a/src/server/main.c b/src/server/main.c
index 6cd3ca42ebeef598fba8983dffdc82692c16e3a5..4456883a957a5ba2c2503eafbb08d23144477e1a 100644 (file)
--- a/src/server/main.c
+++ b/src/server/main.c
@@ -294,11 +294,6 @@ start_server(int flags)
        have a posix threads u definitly have posix signals -- Sasha */
     sigemptyset(&act.sa_mask);
     act.sa_handler = shutdwn;
-    /* pthreads on Linux use SIGUSR1 (*shrug*) so only catch it if not on
-       a Linux box running POSIX threads -- STM */
-#if !(defined(__linux__) && defined(_EMPTH_POSIX))
-    sigaction(SIGUSR1, &act, NULL);
-#endif
     sigaction(SIGTERM, &act, NULL);
     sigaction(SIGINT, &act, NULL);
     act.sa_handler = panic;