main-afb-daemon: Reorder instantiation of API 63/15663/1
authorJosé Bollo <jose.bollo@iot.bzh>
Tue, 24 Jul 2018 12:45:11 +0000 (14:45 +0200)
committerJosé Bollo <jose.bollo@iot.bzh>
Tue, 24 Jul 2018 14:28:32 +0000 (16:28 +0200)
The client API are now instanciated after the server API.
This allows to be client of itself but forbids to export
(serve) a client API.

Change-Id: I9b19180cfb60108344c2f846427e964df8339430
Signed-off-by: José Bollo <jose.bollo@iot.bzh>
src/main-afb-daemon.c

index ce681e3..721faf2 100644 (file)
@@ -599,18 +599,15 @@ static void start(int signum, void *arg)
        /* load bindings */
        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(main_config->auto_api, afb_autoset_add_any, "the automatic api path set");
-
+       apiset_start_list(main_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");
+       apiset_start_list(main_config->dbus_clients, afb_api_dbus_add_client, "the afb-dbus client");
 #endif
-       apiset_start_list(main_config->ws_servers, afb_api_ws_add_server, "the afb-websocket service");
+       apiset_start_list(main_config->ws_clients, afb_api_ws_add_client_weak, "the afb-websocket client");
 
        DEBUG("Init config done");