X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fmain.c;h=18f5e5ef97564737fe14a4e0a157b2036b00daf8;hb=ca9807f73646f536ac58c002d963a8bb8d245f5d;hp=abb7131b94f01beaf81c33c98cacb68c3e1c34f8;hpb=522569c5a9da8566f5213fa5b9b3abadf746331d;p=src%2Fapp-framework-binder.git

diff --git a/src/main.c b/src/main.c
index abb7131b..18f5e5ef 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);
 }
 
 /*----------------------------------------------------------
@@ -221,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) {
@@ -405,40 +444,42 @@ static void start()
 		goto error;
 	}
 
+	/* set the directories */
 	mkdir(config->workdir, S_IRWXU | S_IRGRP | S_IXGRP);
 	if (chdir(config->workdir) < 0) {
 		ERROR("Can't enter working dir %s", config->workdir);
 		goto error;
 	}
+	if (afb_common_rootdir_set(config->rootdir) < 0) {
+		ERROR("failed to set common root directory");
+		goto error;
+	}
 
+	/* configure the daemon */
 	afb_apis_set_timeout(config->apiTimeout);
+	afb_session_init(config->nbSessionMax, config->cntxTimeout, config->token);
+	if (!afb_hreq_init_cookie(config->httpdPort, config->rootapi, config->cntxTimeout)) {
+		ERROR("initialisation of cookies failed");
+		goto error;
+	}
+
+	/* 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);
+
+	/* load bindings */
 	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");
 	start_list(config->so_bindings, afb_api_so_add_binding, "the binding");
 
-	afb_session_init(config->nbSessionMax, config->cntxTimeout, config->token);
-
 	start_list(config->dbus_servers, afb_api_dbus_add_server, "the afb-dbus service");
 	start_list(config->ws_servers, afb_api_ws_add_server, "the afb-websocket service");
 
-	if (!afb_hreq_init_cookie(config->httpdPort, config->rootapi, config->cntxTimeout)) {
-		ERROR("initialisation of cookies failed");
-		goto error;
-	}
-
-	// set the root dir
-	if (afb_common_rootdir_set(config->rootdir) < 0) {
-		ERROR("failed to set common root directory");
-		goto error;
-	}
-
 	DEBUG("Init config done");
 
-	/* install trace of requests */
-	if (config->tracereq)
-		afb_hook_xreq_create(NULL, NULL, NULL, config->tracereq, NULL, NULL);
-
 	/* start the services */
 	if (afb_apis_start_all_services(1) < 0)
 		goto error;
@@ -460,6 +501,7 @@ static void start()
 error:
 	exit(1);
 }
+
 /*---------------------------------------------------------
  | main
  |   Parse option and launch action
@@ -470,8 +512,6 @@ 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 -------
@@ -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);