logd: add udebug support

[project/ubox.git] / log / logd.c

diff --git a/log/logd.c b/log/logd.c
index 9931723f6974fd35c156bc94345df0f858537f2b..96042964a5f8c07041d4e899fc7f0fe31e910b9c 100644 (file)
--- a/log/logd.c
+++ b/log/logd.c
@@ -11,6 +11,8 @@
  * GNU General Public License for more details.
  */
 
+#include <sys/types.h>
+#include <pwd.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <syslog.h>
@@ -22,6 +24,7 @@
 #include <libubox/blobmsg.h>
 #include <libubox/list.h>
 #include <libubox/ustream.h>
+#include <libubox/utils.h>
 #include <libubus.h>
 
 #include "syslog.h"
@@ -29,6 +32,7 @@
 int debug = 0;
 static struct blob_buf b;
 static struct ubus_auto_conn conn;
+static struct udebug_ubus udebug;
 static LIST_HEAD(clients);
 
 enum {
@@ -119,7 +123,7 @@ read_log(struct ubus_context *ctx, struct ubus_object *obj,
        l = log_list(count, NULL);
        if (stream) {
                if (pipe(fds) == -1) {
-                       fprintf(stderr, "logd: failed to create pipe: %s\n", strerror(errno));
+                       fprintf(stderr, "logd: failed to create pipe: %m\n");
                        return -1;
                }
 
@@ -205,7 +209,7 @@ ubus_notify_log(struct log_head *l)
 {
        struct client *c;
 
-       if (list_empty(&clients))
+       if (list_empty(&clients) && !log_object.has_subscribers)
                return;
 
        blob_buf_init(&b, 0);
@@ -215,6 +219,9 @@ ubus_notify_log(struct log_head *l)
        blobmsg_add_u32(&b, "source", l->source);
        blobmsg_add_u64(&b, "time", (((__u64) l->ts.tv_sec) * 1000) + (l->ts.tv_nsec / 1000000));
 
+       if (log_object.has_subscribers)
+               ubus_notify(&conn.ctx, &log_object, "message", b.head, -1);
+
        list_for_each_entry(c, &clients, list)
                ustream_write(&c->s.stream, (void *) b.head, blob_len(b.head) + sizeof(struct blob_attr), false);
 
@@ -238,6 +245,7 @@ int
 main(int argc, char **argv)
 {
        int ch, log_size = 16;
+       struct passwd *p = NULL;
 
        signal(SIGPIPE, SIG_IGN);
        while ((ch = getopt(argc, argv, "S:")) != -1) {
@@ -255,7 +263,21 @@ main(int argc, char **argv)
        log_init(log_size);
        conn.cb = ubus_connect_handler;
        ubus_auto_connect(&conn);
+       udebug_ubus_init(&udebug, &conn.ctx, "log", log_udebug_config);
+       p = getpwnam("logd");
+       if (p) {
+               if (setgid(p->pw_gid) < 0) {
+                       fprintf(stderr, "setgid() failed: %s\n", strerror(errno));
+                       exit(1);
+               }
+
+               if (setuid(p->pw_uid) < 0) {
+                       fprintf(stderr, "setuid() failed: %s\n", strerror(errno));
+                       exit(1);
+               }
+       }
        uloop_run();
+       udebug_ubus_free(&udebug);
        log_shutdown();
        uloop_done();
        ubus_auto_shutdown(&conn);