Fix typo

[src/app-framework-binder.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 1c85411..6db1e2a 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -99,11 +99,49 @@ static void start_list(struct afb_config_list *list,
  +--------------------------------------------------------- */
 static void exit_handler()
 {
-       /* TODO: check whether using SIGHUP isn't better */
+       struct sigaction siga;
+
+       memset(&siga, 0, sizeof siga);
+       siga.sa_handler = SIG_IGN;
+       sigaction(SIGTERM, &siga, NULL);
+
        if (SELF_PGROUP)
-               killpg(0, SIGKILL);
+               killpg(0, SIGTERM);
        else if (childpid > 0)
-               killpg(childpid, SIGKILL);
+               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);
 }
 
 /*----------------------------------------------------------
@@ -222,7 +260,7 @@ static struct afb_hsrv *start_http_server()
        }
 
        NOTICE("Waiting port=%d rootdir=%s", config->httpdPort, config->rootdir);
-       NOTICE("Browser URL= http:/*localhost:%d", config->httpdPort);
+       NOTICE("Browser URL= http://localhost:%d", config->httpdPort);
 
        rc = afb_hsrv_start(hsrv, (uint16_t) config->httpdPort, 15);
        if (!rc) {
@@ -412,7 +450,13 @@ static void start()
                goto error;
        }
 
-       afb_api_so_set_timeout(config->apiTimeout);
+       /* install hooks */
+       if (config->tracereq)
+               afb_hook_create_xreq(NULL, NULL, NULL, config->tracereq, NULL, NULL);
+       if (config->traceditf)
+               afb_hook_create_ditf(NULL, config->traceditf, NULL, NULL);
+
+       afb_apis_set_timeout(config->apiTimeout);
        start_list(config->dbus_clients, afb_api_dbus_add_client, "the afb-dbus client");
        start_list(config->ws_clients, afb_api_ws_add_client, "the afb-websocket client");
        start_list(config->ldpaths, afb_api_so_add_pathset, "the binding path set");
@@ -436,10 +480,6 @@ static void start()
 
        DEBUG("Init config done");
 
-       /* install trace of requests */
-       if (config->tracereq)
-               afb_hook_req_create(NULL, NULL, NULL, config->tracereq, NULL, NULL);
-
        /* start the services */
        if (afb_apis_start_all_services(1) < 0)
                goto error;
@@ -461,6 +501,7 @@ static void start()
 error:
        exit(1);
 }
+
 /*---------------------------------------------------------
  | main
  |   Parse option and launch action
@@ -471,12 +512,11 @@ int main(int argc, char *argv[])
        // let's run this program with a low priority
        nice(20);
 
-       LOGAUTH("afb-daemon");
-
        sd_fds_init();
 
        // ------------- Build session handler & init config -------
        config = afb_config_parse_arguments(argc, argv);
+       INFO("running with pid %d", getpid());
 
        // --------- run -----------
        if (config->background) {
@@ -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);