add new main.c and fix Makefile/headers

[project/procd.git] / ubus.c

diff --git a/ubus.c b/ubus.c
index 8c51b53..e6f9922 100644 (file)
--- a/ubus.c
+++ b/ubus.c
@@ -22,7 +22,7 @@ static void procd_restart_ubus(void)
        char *argv[] = { "ubusd", NULL, ubus_socket, NULL };
 
        if (ubus_proc.pending) {
-               DPRINTF("Killing existing ubus instance, pid=%d\n", (int) ubus_proc.pid);
+               ERROR("Killing existing ubus instance, pid=%d\n", (int) ubus_proc.pid);
                kill(ubus_proc.pid, SIGKILL);
                uloop_process_delete(&ubus_proc);
        }
@@ -38,11 +38,11 @@ static void procd_restart_ubus(void)
        }
 
        if (ubus_proc.pid <= 0) {
-               DPRINTF("Failed to start new ubus instance\n");
+               ERROR("Failed to start new ubus instance\n");
                return;
        }
 
-       DPRINTF("Launched new ubus instance, pid=%d\n", (int) ubus_proc.pid);
+       LOG("Launched new ubus instance, pid=%d\n", (int) ubus_proc.pid);
        uloop_process_add(&ubus_proc);
 }
 
@@ -55,13 +55,17 @@ static void procd_ubus_try_connect(void)
 
        ctx = ubus_connect(ubus_socket);
        if (!ctx) {
-               DPRINTF("Connection to ubus failed\n");
+               DEBUG(2, "Connection to ubus failed\n");
                return;
        }
 
        ctx->connection_lost = procd_ubus_connection_lost;
        ubus_connected = true;
-       procd_init_service(ctx);
+       ubus_init_service(ctx);
+       if (getpid() == 1) {
+               ubus_init_log(ctx);
+               ubus_init_system(ctx);
+       }
 }
 
 static void procd_ubus_connection_lost(struct ubus_context *old_ctx)
@@ -73,7 +77,7 @@ static void procd_ubus_connection_lost(struct ubus_context *old_ctx)
                procd_ubus_try_connect();
        }
 
-       DPRINTF("Connected to ubus, id=%08x\n", ctx->local_id);
+       LOG("Connected to ubus, id=%08x\n", ctx->local_id);
        ubus_add_uloop(ctx);
 }