summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosé Bollo <jose.bollo@iot.bzh>2017-04-10 13:10:48 +0200
committerJosé Bollo <jose.bollo@iot.bzh>2017-04-10 13:10:48 +0200
commit66bb3573209471d1bbc5cf53ade1f6edee40e467 (patch)
tree1fc8a8633fdda2fe07a5c54d71a8829ade1f1d49
parent2243a0dd1adc75530bed663db808971789729df3 (diff)
Isolate interupt management
Provision daemon features: - SIGTERM for terminating - SIGHUP for config reload Change-Id: Id45a0b963812105c22ead5a0a2004f3f531a2a65 Signed-off-by: José Bollo <jose.bollo@iot.bzh>
-rw-r--r--src/main.c51
1 files changed, 44 insertions, 7 deletions
diff --git a/src/main.c b/src/main.c
index a1b09c1e..b7f86372 100644
--- a/src/main.c
+++ b/src/main.c
@@ -99,10 +99,49 @@ static void start_list(struct afb_config_list *list,
+--------------------------------------------------------- */
static void exit_handler()
{
+ struct sigaction siga;
+
+ memset(&siga, 0, sizeof siga);
+ siga.sa_handler = SIG_IGN;
+ sigaction(SIGTERM, &siga, NULL);
+
if (SELF_PGROUP)
- killpg(0, SIGHUP);
+ killpg(0, SIGTERM);
else if (childpid > 0)
- killpg(childpid, SIGHUP);
+ killpg(childpid, SIGTERM);
+}
+
+static void on_sigterm(int signum, siginfo_t *info, void *uctx)
+{
+ NOTICE("Received SIGTERM");
+ exit(0);
+}
+
+static void on_sighup(int signum, siginfo_t *info, void *uctx)
+{
+ NOTICE("Received SIGHUP");
+ /* TODO */
+}
+
+static void setup_daemon()
+{
+ struct sigaction siga;
+
+ /* install signal handlers */
+ memset(&siga, 0, sizeof siga);
+ siga.sa_flags = SA_SIGINFO;
+
+ siga.sa_sigaction = on_sigterm;
+ sigaction(SIGTERM, &siga, NULL);
+
+ siga.sa_sigaction = on_sighup;
+ sigaction(SIGHUP, &siga, NULL);
+
+ /* handle groups */
+ atexit(exit_handler);
+
+ /* ignore any SIGPIPE */
+ signal(SIGPIPE, SIG_IGN);
}
/*----------------------------------------------------------
@@ -462,6 +501,7 @@ static void start()
error:
exit(1);
}
+
/*---------------------------------------------------------
| main
| Parse option and launch action
@@ -488,11 +528,8 @@ int main(int argc, char *argv[])
INFO("entering foreground mode");
}
- /* handle groups */
- atexit(exit_handler);
-
- /* ignore any SIGPIPE */
- signal(SIGPIPE, SIG_IGN);
+ /* set the daemon environment */
+ setup_daemon();
/* enter job processing */
jobs_start(3, 0, 50, start);