+/*
+ * 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>
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);
}
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);
}
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)
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);
}