X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=postlicyd.c;fp=postlicyd.c;h=d7878d35c43852a72bcf34c462225c21e6e9a5b0;hb=2472ae9bd2a2a22a278ffe586fd381e70c881e8d;hp=e9eb1c2ae7610f4c1a308ae230b2239558675a6a;hpb=8f9347bce988e34c59ab1b4cf9a4a087b81d4959;p=apps%2Fpfixtools.git

diff --git a/postlicyd.c b/postlicyd.c
index e9eb1c2..d7878d3 100644
--- a/postlicyd.c
+++ b/postlicyd.c
@@ -39,44 +39,16 @@
 
 #include "common.h"
 
-static sig_atomic_t cleanexit = false;
-static sig_atomic_t sigint    = false;
-static volatile int nbthreads = 0;
+volatile int nbthreads = 0;
 
-static void main_sighandler(int sig)
-{
-    static time_t lastintr = 0;
-    time_t now = time(NULL);
-
-    switch (sig) {
-      case SIGINT:
-        if (sigint) {
-            if (now - lastintr >= 1)
-                break;
-        } else {
-            lastintr = now;
-            sigint   = true;
-        }
-        return;
-
-      case SIGTERM:
-        break;
-
-      default:
-        return;
-    }
-
-    syslog(LOG_ERR, "Killed...");
-    exit(-1);
-}
-
-static void main_initialize(void)
+static int main_initialize(void)
 {
     openlog("postlicyd", LOG_PID, LOG_MAIL);
     signal(SIGPIPE, SIG_IGN);
-    signal(SIGINT,  &main_sighandler);
-    signal(SIGTERM, &main_sighandler);
+    signal(SIGINT,  &common_sighandler);
+    signal(SIGTERM, &common_sighandler);
     syslog(LOG_INFO, "Starting...");
+    return 0;
 }
 
 void *job_run(void *_fd)
@@ -118,15 +90,17 @@ static void main_shutdown(void)
     closelog();
 }
 
+module_init(main_initialize);
+module_exit(main_shutdown);
+
 int main(void)
 {
-    if (atexit(main_shutdown)) {
+    if (atexit(common_shutdown)) {
         fputs("Cannot hook my atexit function, quitting !\n", stderr);
         return EXIT_FAILURE;
     }
 
-    main_initialize();
+    common_initialize();
     main_loop();
-    main_shutdown();
     return EXIT_SUCCESS;
 }