#include "afb-hsrv.h"
#include "afb-context.h"
#include "afb-hreq.h"
-#include "sig-monitor.h"
#include "jobs.h"
#include "afb-session.h"
#include "verbose.h"
+--------------------------------------------------------- */
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);
}
/*----------------------------------------------------------
}
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) {
}
/*---------------------------------------------------------
- | main
- | Parse option and launch action
+ | job for starting the daemon
+--------------------------------------------------------- */
-int main(int argc, char *argv[])
+static void start()
{
struct afb_hsrv *hsrv;
- struct sd_event *eventloop;
-
- LOGAUTH("afb-daemon");
-
- sd_fds_init();
-
- // ------------- Build session handler & init config -------
- config = afb_config_parse_arguments(argc, argv);
- atexit(exit_handler);
// ------------------ sanity check ----------------------------------------
if (config->httpdPort <= 0) {
ERROR("no port is defined");
- exit(1);
+ goto error;
}
mkdir(config->workdir, S_IRWXU | S_IRGRP | S_IXGRP);
if (chdir(config->workdir) < 0) {
ERROR("Can't enter working dir %s", config->workdir);
- exit(1);
+ 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");
start_list(config->so_bindings, afb_api_so_add_binding, "the binding");
- afb_session_init(config->nbSessionMax, config->cntxTimeout, config->token, afb_apis_count());
+ 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");
- exit(1);
- }
-
- if (sig_monitor_init() < 0) {
- ERROR("failed to initialise signal handlers");
- return 1;
+ goto error;
}
// set the root dir
if (afb_common_rootdir_set(config->rootdir) < 0) {
ERROR("failed to set common root directory");
- return 1;
+ goto error;
}
- if (jobs_init(3, 1, 20) < 0) {
- ERROR("failed to initialise threading");
- return 1;
- }
- // let's run this program with a low priority
- nice(20);
-
- // ------------------ Finaly Process Commands -----------------------------
- // let's not take the risk to run as ROOT
- //if (getuid() == 0) goto errorNoRoot;
-
DEBUG("Init config done");
- // --------- run -----------
- if (config->background) {
- // --------- in background mode -----------
- INFO("entering background mode");
- daemonize();
- } else {
- // ---- in foreground mode --------------------
- INFO("entering foreground mode");
- }
-
- /* ignore any SIGPIPE */
- signal(SIGPIPE, SIG_IGN);
-
- /* 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)
- exit(1);
+ goto error;
/* start the HTTP server */
if (!config->noHttpd) {
hsrv = start_http_server();
if (hsrv == NULL)
- exit(1);
+ goto error;
}
/* run the command */
if (execute_command() < 0)
- exit(1);
-
- /* signal that ready */
- if (config->readyfd != 0) {
- static const char readystr[] = "READY=1";
- write(config->readyfd, readystr, sizeof(readystr) - 1);
- close(config->readyfd);
- }
+ goto error;
- // infinite loop
- eventloop = afb_common_get_event_loop();
+ /* ready */
sd_notify(1, "READY=1");
- for (;;)
- sd_event_run(eventloop, 30000000);
+ return;
+error:
+ exit(1);
+}
- WARNING("hoops returned from infinite loop [report bug]");
+/*---------------------------------------------------------
+ | main
+ | Parse option and launch action
+ +--------------------------------------------------------- */
- return 0;
+int main(int argc, char *argv[])
+{
+ // let's run this program with a low priority
+ nice(20);
+
+ 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) {
+ // --------- in background mode -----------
+ INFO("entering background mode");
+ daemonize();
+ } else {
+ // ---- in foreground mode --------------------
+ INFO("entering foreground mode");
+ }
+
+ /* set the daemon environment */
+ setup_daemon();
+
+ /* enter job processing */
+ jobs_start(3, 0, 50, start);
+ WARNING("hoops returned from jobs_enter! [report bug]");
+ return 1;
}
+
Code Review / src / app-framework-binder.git / blobdiff