afb-socket: Relax requirement of tcp ending slash

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

diff --git a/src/main-afb-daemon.c b/src/main-afb-daemon.c
index 0db84bc..65481c4 100644 (file)
--- a/src/main-afb-daemon.c
+++ b/src/main-afb-daemon.c
@@ -50,7 +50,6 @@
 #include "afb-hsrv.h"
 #include "afb-hreq.h"
 #include "afb-xreq.h"
-#include "jobs.h"
 #include "afb-session.h"
 #include "verbose.h"
 #include "afb-common.h"
@@ -59,12 +58,15 @@
 #include "afb-hook.h"
 #include "afb-hook-flags.h"
 #include "afb-debug.h"
-#include "process-name.h"
-#include "wrap-json.h"
 #if defined(WITH_SUPERVISION)
 #   include "afb-supervision.h"
 #endif
 
+#include "process-name.h"
+#include "wrap-json.h"
+#include "jobs.h"
+#include "sig-monitor.h"
+
 /*
    if SELF_PGROUP == 0 the launched command is the group leader
    if SELF_PGROUP != 0 afb-daemon is the group leader
@@ -213,13 +215,14 @@ static void setup_daemon()
  +--------------------------------------------------------- */
 static void daemonize()
 {
-       int fd = 0, daemon;
+       int fd = 0, daemon, nostdin;
        const char *output;
        pid_t pid;
 
        daemon = 0;
        output = NULL;
        wrap_json_unpack(main_config, "{s?b s?s}", "daemon", &daemon, "output", &output);
+       nostdin = 0;
 
        if (output) {
                fd = open(output, O_WRONLY | O_APPEND | O_CREAT, 0640);
@@ -239,6 +242,8 @@ static void daemonize()
                }
                if (pid != 0)
                        _exit(0);
+
+               nostdin = 1;
        }
 
        /* closes the input */
@@ -251,8 +256,8 @@ static void daemonize()
                close(fd);
        }
 
-       /* after that ctrl+C still works */
-       close(0);
+       if (nostdin)
+               close(0); /* except if 'daemon', ctrl+C still works after that */
 }
 
 /*---------------------------------------------------------
@@ -759,15 +764,13 @@ static void start(int signum, void *arg)
        if (traceglob)
                afb_hook_create_global(afb_hook_flags_global_from_text(traceglob), NULL, NULL);
 
-       /* load bindings */
+       /* load bindings and apis */
        afb_debug("start-load");
        apiset_start_list("binding", afb_api_so_add_binding, "the binding");
        apiset_start_list("ldpaths", afb_api_so_add_pathset_fails, "the binding path set");
        apiset_start_list("weak-ldpaths", afb_api_so_add_pathset_nofails, "the weak binding path set");
        apiset_start_list("auto-api", afb_autoset_add_any, "the automatic api path set");
-       apiset_start_list("ws-server", afb_api_ws_add_server, "the afb-websocket service");
 #if defined(WITH_DBUS_TRANSPARENCY)
-       apiset_start_list("dbus-server", afb_api_dbus_add_server, "the afb-dbus service");
        apiset_start_list("dbus-client", afb_api_dbus_add_client, "the afb-dbus client");
 #endif
        apiset_start_list("ws-client", afb_api_ws_add_client_weak, "the afb-websocket client");
@@ -782,6 +785,12 @@ static void start(int signum, void *arg)
        if (afb_apiset_start_all_services(main_apiset) < 0)
                goto error;
 
+       /* export started apis */
+       apiset_start_list("ws-server", afb_api_ws_add_server, "the afb-websocket service");
+#if defined(WITH_DBUS_TRANSPARENCY)
+       apiset_start_list("dbus-server", afb_api_dbus_add_server, "the afb-dbus service");
+#endif
+
        /* start the HTTP server */
        afb_debug("start-http");
        if (!no_httpd) {
@@ -823,15 +832,23 @@ error:
 
 int main(int argc, char *argv[])
 {
-       struct json_object *name;
+       struct json_object *obj;
        afb_debug("main-entry");
 
        // ------------- Build session handler & init config -------
        main_config = afb_config_parse_arguments(argc, argv);
-       if (json_object_object_get_ex(main_config, "name", &name)) {
-               verbose_set_name(json_object_get_string(name), 0);
-               process_name_set_name(json_object_get_string(name));
-               process_name_replace_cmdline(argv, json_object_get_string(name));
+       if (sig_monitor_init(
+               !json_object_object_get_ex(main_config, "trap-faults", &obj)
+                       || json_object_get_boolean(obj)) < 0) {
+               ERROR("failed to initialise signal handlers");
+               return 1;
+       }
+
+
+       if (json_object_object_get_ex(main_config, "name", &obj)) {
+               verbose_set_name(json_object_get_string(obj), 0);
+               process_name_set_name(json_object_get_string(obj));
+               process_name_replace_cmdline(argv, json_object_get_string(obj));
        }
        afb_debug("main-args");