X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=ubus.c;h=202646a7422cdd07ae04b95929999b8b1584f034;hb=bdac146facb72ce3f88f682d598d3124ec73fe78;hp=bba59b48a61a7c58a676a28a859006028889e026;hpb=ca808f5c335a873c87359ce024e1a14ebae706b9;p=project%2Fprocd.git

diff --git a/ubus.c b/ubus.c
index bba59b4..202646a 100644
--- a/ubus.c
+++ b/ubus.c
@@ -1,15 +1,29 @@
+/*
+ * Copyright (C) 2013 Felix Fietkau <nbd@openwrt.org>
+ * Copyright (C) 2013 John Crispin <blogic@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 2.1
+ * as published by the Free Software Foundation
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <sys/resource.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <signal.h>
 
-#include <libubus.h>
-
 #include "procd.h"
 
 char *ubus_socket = NULL;
 static struct ubus_context *ctx;
 static struct uloop_process ubus_proc;
 static bool ubus_connected = false;
+static int reconnect = 1;
 
 static void procd_ubus_connection_lost(struct ubus_context *old_ctx);
 
@@ -23,7 +37,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);
 	}
@@ -33,16 +47,17 @@ static void procd_restart_ubus(void)
 
 	ubus_proc.pid = fork();
 	if (!ubus_proc.pid) {
+		setpriority(PRIO_PROCESS, 0, -20);
 		execvp(argv[0], argv);
 		exit(-1);
 	}
 
 	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);
+	DEBUG(1, "Launched new ubus instance, pid=%d\n", (int) ubus_proc.pid);
 	uloop_process_add(&ubus_proc);
 }
 
@@ -55,16 +70,23 @@ 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;
+	ubus_init_service(ctx);
+	ubus_init_system(ctx);
+	if (getpid() == 1)
+		ubus_init_log(ctx);
 }
 
 static void procd_ubus_connection_lost(struct ubus_context *old_ctx)
 {
+	if (!reconnect)
+		return;
+
 	procd_ubus_try_connect();
 	while (!ubus_connected) {
 		procd_restart_ubus();
@@ -72,7 +94,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);
+	DEBUG(1, "Connected to ubus, id=%08x\n", ctx->local_id);
 	ubus_add_uloop(ctx);
 }
 
@@ -82,3 +104,8 @@ void procd_connect_ubus(void)
 	procd_ubus_connection_lost(NULL);
 }
 
+void procd_reconnect_ubus(int _reconnect)
+{
+	reconnect = _reconnect;
+}
+