extend examples a bit

[elogind.git] / manager.c

diff --git a/manager.c b/manager.c
index a598f1241d52fc003732feeab10772414f68d940..f15cf79869f3a23028e60025037c759661612ca2 100644 (file)
--- a/manager.c
+++ b/manager.c
@@ -15,6 +15,7 @@
 #include "macro.h"
 #include "strv.h"
 #include "log.h"
+#include "util.h"
 
 Manager* manager_new(void) {
         Manager *m;
@@ -41,9 +42,14 @@ Manager* manager_new(void) {
         if ((m->epoll_fd = epoll_create1(EPOLL_CLOEXEC)) < 0)
                 goto fail;
 
+        assert_se(reset_all_signal_handlers() == 0);
+
         assert_se(sigemptyset(&mask) == 0);
         assert_se(sigaddset(&mask, SIGCHLD) == 0);
         assert_se(sigaddset(&mask, SIGINT) == 0);
+        assert_se(sigaddset(&mask, SIGTERM) == 0);
+        assert_se(sigaddset(&mask, SIGWINCH) == 0);
+        assert_se(sigaddset(&mask, SIGHUP) == 0);
         assert_se(sigprocmask(SIG_SETMASK, &mask, NULL) == 0);
 
         m->signal_watch.type = WATCH_SIGNAL_FD;
@@ -1004,8 +1010,12 @@ static int manager_process_signal_fd(Manager *m, bool *quit) {
                         break;
 
                 case SIGINT:
+                case SIGTERM:
                         *quit = true;
                         return 0;
+
+                default:
+                        log_info("Got unhandled signal <%s>.", strsignal(sfsi.ssi_signo));
                 }
         }