#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 */
if (SELF_PGROUP)
- killpg(0, SIGKILL);
+ killpg(0, SIGHUP);
else if (childpid > 0)
- killpg(childpid, SIGKILL);
+ killpg(childpid, SIGHUP);
}
/*----------------------------------------------------------
}
/*---------------------------------------------------------
- | main event processing
+ | job for starting the daemon
+--------------------------------------------------------- */
-static void main_evloop(int signum, void *closure)
-{
- struct sd_event *evloop = closure;
- if (signum == 0)
- sd_event_run(evloop, 30000000);
-}
-
-/*---------------------------------------------------------
- | main
- | Parse option and launch action
- +--------------------------------------------------------- */
-
-int main(int argc, char *argv[])
+static void start()
{
struct afb_hsrv *hsrv;
- 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);
+ 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");
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);
-
- /* records the loop */
- if (jobs_add_event_loop(NULL, 0, main_evloop, afb_common_get_event_loop()) < 0) {
- ERROR("failed to set main_evloop");
- return 1;
- }
+ goto error;
/* ready */
sd_notify(1, "READY=1");
+ return;
+error:
+ exit(1);
+}
+/*---------------------------------------------------------
+ | main
+ | Parse option and launch action
+ +--------------------------------------------------------- */
- /* turn as processing thread */
- jobs_add_me();
- WARNING("hoops returned from jobs_add_me! [report bug]");
- return 0;
+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);
+
+ // --------- run -----------
+ if (config->background) {
+ // --------- in background mode -----------
+ INFO("entering background mode");
+ daemonize();
+ } else {
+ // ---- in foreground mode --------------------
+ INFO("entering foreground mode");
+ }
+
+ /* handle groups */
+ atexit(exit_handler);
+
+ /* ignore any SIGPIPE */
+ signal(SIGPIPE, SIG_IGN);
+
+ /* enter job processing */
+ jobs_start(3, 0, 50, start);
+ WARNING("hoops returned from jobs_enter! [report bug]");
+ return 1;
}
+