/*
- * Copyright (C) 2015, 2016, 2017 "IoT.bzh"
+ * Copyright (C) 2015-2018 "IoT.bzh"
* Author "Fulup Ar Foll"
* Author José Bollo <jose.bollo@iot.bzh>
*
*/
#define _GNU_SOURCE
-#define NO_BINDING_VERBOSE_MACRO
#include <stdlib.h>
+#include <stdio.h>
#include <stdint.h>
#include <signal.h>
#include <string.h>
#include <sys/stat.h>
#include <sys/wait.h>
+#if !defined(NO_CALL_PERSONALITY)
+#include <sys/personality.h>
+#endif
+
#include <json-c/json.h>
#include <systemd/sd-daemon.h>
#include "afb-hswitch.h"
#include "afb-apiset.h"
#include "afb-api-so.h"
-#include "afb-api-dbus.h"
+#if defined(WITH_DBUS_TRANSPARENCY)
+# include "afb-api-dbus.h"
+#endif
#include "afb-api-ws.h"
#include "afb-hsrv.h"
#include "afb-hreq.h"
#include "afb-session.h"
#include "verbose.h"
#include "afb-common.h"
+#include "afb-monitor.h"
#include "afb-hook.h"
-#include "sd-fds.h"
+#include "afb-debug.h"
+#include "process-name.h"
+#include "afb-supervision.h"
/*
if SELF_PGROUP == 0 the launched command is the group leader
#define SELF_PGROUP 1
struct afb_apiset *main_apiset;
+struct afb_config *main_config;
-static struct afb_config *config;
static pid_t childpid;
/*----------------------------------------------------------
killpg(0, SIGTERM);
else if (childpid > 0)
killpg(childpid, SIGTERM);
- exit(0);
}
static void on_sigterm(int signum, siginfo_t *info, void *uctx)
int pid;
// open /dev/console to redirect output messAFBes
- consoleFD = open(config->console, O_WRONLY | O_APPEND | O_CREAT, 0640);
+ consoleFD = open(main_config->console, O_WRONLY | O_APPEND | O_CREAT, 0640);
if (consoleFD < 0) {
ERROR("AFB-daemon cannot open /dev/console (use --foreground)");
exit(1);
// son process get all data in standalone mode
NOTICE("background mode [pid:%d console:%s]", getpid(),
- config->console);
+ main_config->console);
// redirect default I/O on console
close(2);
static int init_http_server(struct afb_hsrv *hsrv)
{
if (!afb_hsrv_add_handler
- (hsrv, config->rootapi, afb_hswitch_websocket_switch, main_apiset, 20))
+ (hsrv, main_config->rootapi, afb_hswitch_websocket_switch, main_apiset, 20))
return 0;
if (!afb_hsrv_add_handler
- (hsrv, config->rootapi, afb_hswitch_apis, main_apiset, 10))
+ (hsrv, main_config->rootapi, afb_hswitch_apis, main_apiset, 10))
return 0;
- if (run_for_list(config->aliases, init_alias, hsrv))
+ if (run_for_list(main_config->aliases, init_alias, hsrv))
return 0;
- if (config->roothttp != NULL) {
+ if (main_config->roothttp != NULL) {
if (!afb_hsrv_add_alias
- (hsrv, "", afb_common_rootdir_get_fd(), config->roothttp,
+ (hsrv, "", afb_common_rootdir_get_fd(), main_config->roothttp,
-10, 1))
return 0;
}
if (!afb_hsrv_add_handler
- (hsrv, config->rootbase, afb_hswitch_one_page_api_redirect, NULL,
+ (hsrv, main_config->rootbase, afb_hswitch_one_page_api_redirect, NULL,
-20))
return 0;
int rc;
struct afb_hsrv *hsrv;
- if (afb_hreq_init_download_path(config->uploaddir)) {
- ERROR("unable to set the upload directory %s", config->uploaddir);
+ if (afb_hreq_init_download_path(main_config->uploaddir)) {
+ ERROR("unable to set the upload directory %s", main_config->uploaddir);
return NULL;
}
return NULL;
}
- if (!afb_hsrv_set_cache_timeout(hsrv, config->cacheTimeout)
+ if (!afb_hsrv_set_cache_timeout(hsrv, main_config->cacheTimeout)
|| !init_http_server(hsrv)) {
ERROR("initialisation of httpd failed");
afb_hsrv_put(hsrv);
return NULL;
}
- NOTICE("Waiting port=%d rootdir=%s", config->httpdPort, config->rootdir);
- NOTICE("Browser URL= http://localhost:%d", config->httpdPort);
+ NOTICE("Waiting port=%d rootdir=%s", main_config->httpdPort, main_config->rootdir);
+ NOTICE("Browser URL= http://localhost:%d", main_config->httpdPort);
- rc = afb_hsrv_start(hsrv, (uint16_t) config->httpdPort, 15);
+ rc = afb_hsrv_start(hsrv, (uint16_t) main_config->httpdPort, 15);
if (!rc) {
ERROR("starting of httpd failed");
afb_hsrv_put(hsrv);
/*---------------------------------------------------------
| execute_command
- |
+--------------------------------------------------------- */
static void on_sigchld(int signum, siginfo_t *info, void *uctx)
switch(*++it) {
case 'p': wr = stpcpy(wr, port); break;
case 't': wr = stpcpy(wr, token); break;
- default: *wr++ = SUBST_CHAR;
+ default: *wr++ = SUBST_CHAR; /*@fallthrough@*/
case SUBST_CHAR: *wr++ = *it;
}
arg = ++it;
int i;
/* instanciate the arguments */
- for (i = 0 ; config->exec[i] ; i++) {
- repl = instanciate_string(config->exec[i], port, token);
+ for (i = 0 ; main_config->exec[i] ; i++) {
+ repl = instanciate_string(main_config->exec[i], port, token);
if (!repl)
return -1;
- config->exec[i] = repl;
+ main_config->exec[i] = repl;
}
return 0;
}
{
struct sigaction siga;
char port[20];
+ const char *token;
int rc;
/* check whether a command is to execute or not */
- if (!config->exec || !config->exec[0])
+ if (!main_config->exec || !main_config->exec[0])
return 0;
if (SELF_PGROUP)
return 0;
/* compute the string for port */
- if (config->httpdPort)
- rc = snprintf(port, sizeof port, "%d", config->httpdPort);
+ if (main_config->httpdPort)
+ rc = snprintf(port, sizeof port, "%d", main_config->httpdPort);
else
rc = snprintf(port, sizeof port, "%cp", SUBST_CHAR);
if (rc < 0 || rc >= (int)(sizeof port)) {
}
else {
/* instanciate arguments and environment */
- if (instanciate_command_args(port, config->token) >= 0
- && instanciate_environ(port, config->token) >= 0) {
+ token = afb_session_initial_token();
+ if (instanciate_command_args(port, token) >= 0
+ && instanciate_environ(port, token) >= 0) {
/* run */
if (!SELF_PGROUP)
setpgid(0, 0);
- execv(config->exec[0], config->exec);
- ERROR("can't launch %s: %m", config->exec[0]);
+ execv(main_config->exec[0], main_config->exec);
+ ERROR("can't launch %s: %m", main_config->exec[0]);
}
}
exit(1);
struct afb_session *session;
};
-static void startup_call_reply(struct afb_xreq *xreq, int iserror, struct json_object *obj)
+static void startup_call_reply(struct afb_xreq *xreq, int status, struct json_object *obj)
{
struct startup_req *sreq = CONTAINER_OF_XREQ(struct startup_req, xreq);
- if (!iserror)
+ if (status >= 0)
NOTICE("startup call %s returned %s", sreq->current->value, json_object_get_string(obj));
else {
ERROR("startup call %s ERROR! %s", sreq->current->value, json_object_get_string(obj));
sreq->xreq.context.validated = 1;
sreq->api = strndup(api, verb - api);
sreq->verb = strndup(verb + 1, json - verb - 1);
- sreq->xreq.api = sreq->api;
- sreq->xreq.verb = sreq->verb;
+ sreq->xreq.request.api = sreq->api;
+ sreq->xreq.request.verb = sreq->verb;
sreq->xreq.json = json_tokener_parse(json + 1);
if (sreq->api && sreq->verb && sreq->xreq.json) {
afb_xreq_process(&sreq->xreq, main_apiset);
struct afb_config_list *list;
struct startup_req *sreq;
- list = config->calls;
+ list = main_config->calls;
if (list) {
sreq = calloc(1, sizeof *sreq);
- sreq->session = afb_session_create("startup", 3600);
+ sreq->session = afb_session_create(3600);
sreq->current = list;
startup_call_current(sreq);
}
| job for starting the daemon
+--------------------------------------------------------- */
-static void start()
+static void start(int signum, void *arg)
{
struct afb_hsrv *hsrv;
- // ------------------ sanity check ----------------------------------------
- if (config->httpdPort <= 0) {
- ERROR("no port is defined");
- goto error;
+ afb_debug("start-entry");
+
+ if (signum) {
+ ERROR("start aborted: received signal %s", strsignal(signum));
+ exit(1);
}
/* 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);
+ mkdir(main_config->workdir, S_IRWXU | S_IRGRP | S_IXGRP);
+ if (chdir(main_config->workdir) < 0) {
+ ERROR("Can't enter working dir %s", main_config->workdir);
goto error;
}
- if (afb_common_rootdir_set(config->rootdir) < 0) {
+ if (afb_common_rootdir_set(main_config->rootdir) < 0) {
ERROR("failed to set common root directory");
goto error;
}
/* configure the daemon */
- 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");
+ if (afb_session_init(main_config->nbSessionMax, main_config->cntxTimeout, main_config->token)) {
+ ERROR("initialisation of session manager failed");
goto error;
}
- main_apiset = afb_apiset_create("main", config->apiTimeout);
+ main_apiset = afb_apiset_create("main", main_config->apiTimeout);
if (!main_apiset) {
ERROR("can't create main api set");
goto error;
}
+ if (afb_monitor_init() < 0) {
+ ERROR("failed to setup monitor");
+ goto error;
+ }
+ if (afb_supervision_init() < 0) {
+ ERROR("failed to setup supervision");
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);
+ if (main_config->tracereq)
+ afb_hook_create_xreq(NULL, NULL, NULL, main_config->tracereq, NULL, NULL);
+ if (main_config->traceditf)
+ afb_hook_create_ditf(NULL, main_config->traceditf, NULL, NULL);
+ if (main_config->tracesvc)
+ afb_hook_create_svc(NULL, main_config->tracesvc, NULL, NULL);
+ if (main_config->traceevt)
+ afb_hook_create_evt(NULL, main_config->traceevt, NULL, NULL);
+ if (main_config->traceses)
+ afb_hook_create_session(NULL, main_config->traceses, NULL, NULL);
/* load bindings */
- apiset_start_list(config->dbus_clients, afb_api_dbus_add_client, "the afb-dbus client");
- apiset_start_list(config->ws_clients, afb_api_ws_add_client, "the afb-websocket client");
- apiset_start_list(config->ldpaths, afb_api_so_add_pathset, "the binding path set");
- apiset_start_list(config->so_bindings, afb_api_so_add_binding, "the binding");
+ afb_debug("start-load");
+ apiset_start_list(main_config->so_bindings, afb_api_so_add_binding, "the binding");
+#if defined(WITH_DBUS_TRANSPARENCY)
+ apiset_start_list(main_config->dbus_clients, afb_api_dbus_add_client, "the afb-dbus client");
+#endif
+ apiset_start_list(main_config->ws_clients, afb_api_ws_add_client_weak, "the afb-websocket client");
+ apiset_start_list(main_config->ldpaths, afb_api_so_add_pathset_fails, "the binding path set");
+ apiset_start_list(main_config->weak_ldpaths, afb_api_so_add_pathset_nofails, "the weak binding path set");
- apiset_start_list(config->dbus_servers, afb_api_dbus_add_server, "the afb-dbus service");
- apiset_start_list(config->ws_servers, afb_api_ws_add_server, "the afb-websocket service");
+#if defined(WITH_DBUS_TRANSPARENCY)
+ apiset_start_list(main_config->dbus_servers, afb_api_dbus_add_server, "the afb-dbus service");
+#endif
+ apiset_start_list(main_config->ws_servers, afb_api_ws_add_server, "the afb-websocket service");
DEBUG("Init config done");
/* start the services */
+ afb_debug("start-start");
+#if !defined(NO_CALL_PERSONALITY)
+ personality((unsigned long)-1L);
+#endif
if (afb_apiset_start_all_services(main_apiset, 1) < 0)
goto error;
/* start the HTTP server */
- if (!config->noHttpd) {
+ afb_debug("start-http");
+ if (!main_config->noHttpd) {
+ if (main_config->httpdPort <= 0) {
+ ERROR("no port is defined");
+ goto error;
+ }
+
+ if (!afb_hreq_init_cookie(main_config->httpdPort, main_config->rootapi, main_config->cntxTimeout)) {
+ ERROR("initialisation of HTTP cookies failed");
+ goto error;
+ }
+
hsrv = start_http_server();
if (hsrv == NULL)
goto error;
}
+ /* run the startup calls */
+ afb_debug("start-call");
+ run_startup_calls();
+
/* run the command */
+ afb_debug("start-exec");
if (execute_command() < 0)
goto error;
/* ready */
sd_notify(1, "READY=1");
-
- /* run the startup calls */
- run_startup_calls();
return;
error:
exit(1);
int main(int argc, char *argv[])
{
+ afb_debug("main-entry");
+
// 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());
+ main_config = afb_config_parse_arguments(argc, argv);
+ if (main_config->name) {
+ verbose_set_name(main_config->name, 0);
+ process_name_set_name(main_config->name);
+ process_name_replace_cmdline(argv, main_config->name);
+ }
+ afb_debug("main-args");
// --------- run -----------
- if (config->background) {
+ if (main_config->background) {
// --------- in background mode -----------
INFO("entering background mode");
daemonize();
// ---- in foreground mode --------------------
INFO("entering foreground mode");
}
+ INFO("running with pid %d", getpid());
/* set the daemon environment */
setup_daemon();
+ afb_debug("main-start");
+
/* enter job processing */
- jobs_start(3, 0, 50, start);
+ jobs_start(3, 0, 50, start, NULL);
WARNING("hoops returned from jobs_enter! [report bug]");
return 1;
}
Code Review / src / app-framework-binder.git / blobdiff