X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fubox.git;a=blobdiff_plain;f=log%2Flogd.c;h=27d3cac8abdda9227e51f0d113cbef09bad5d3c7;hp=e4f9b3f895e43411459260ad35d9fa53a99003e1;hb=b0d5399c3db83c2c8f9d8aae944f873343b3a038;hpb=c8d14b9b5d0fa3a3f99df386b67670e083c82095

diff --git a/log/logd.c b/log/logd.c
index e4f9b3f..27d3cac 100644
--- a/log/logd.c
+++ b/log/logd.c
@@ -55,15 +55,9 @@ client_close(struct ustream *s)
 	free(cl);
 }
 
-static void
-client_notify_write(struct ustream *s, int bytes)
-{
-	client_close(s);
-}
-
 static void client_notify_state(struct ustream *s)
 {
-	return client_close(s);
+	client_close(s);
 }
 
 static int
@@ -76,6 +70,7 @@ read_log(struct ubus_context *ctx, struct ubus_object *obj,
 	struct log_head *l;
 	int count = 0;
 	int fds[2];
+	int ret;
 
 	if (msg) {
 		blobmsg_parse(&read_policy, 1, &tb, blob_data(msg), blob_len(msg));
@@ -83,10 +78,12 @@ read_log(struct ubus_context *ctx, struct ubus_object *obj,
 			count = blobmsg_get_u32(tb);
 	}
 
-	pipe(fds);
+	if (pipe(fds) == -1) {
+		fprintf(stderr, "logd: failed to create pipe: %s\n", strerror(errno));
+		return -1;
+	}
 	ubus_request_set_fd(ctx, req, fds[0]);
 	cl = calloc(1, sizeof(*cl));
-	cl->s.stream.notify_write = client_notify_write;
 	cl->s.stream.notify_state = client_notify_state;
 	cl->fd = fds[1];
 	ustream_fd_init(&cl->s, cl->fd);
@@ -98,9 +95,11 @@ read_log(struct ubus_context *ctx, struct ubus_object *obj,
 		blobmsg_add_u32(&b, "id", l->id);
 		blobmsg_add_u32(&b, "priority", l->priority);
 		blobmsg_add_u32(&b, "source", l->source);
-		blobmsg_add_u64(&b, "time", l->ts.tv_sec);
+		blobmsg_add_u64(&b, "time", l->ts.tv_sec * 1000LL);
 		l = log_list(count, l);
-		if (ustream_write(&cl->s.stream, (void *) b.head, blob_len(b.head) + sizeof(struct blob_attr), false) <= 0)
+		ret = ustream_write(&cl->s.stream, (void *) b.head, blob_len(b.head) + sizeof(struct blob_attr), false);
+		blob_buf_free(&b);
+		if (ret < 0)
 			break;
 	}
 	return 0;
@@ -148,15 +147,17 @@ ubus_notify_log(struct log_head *l)
 	if (list_empty(&clients))
 		return;
 
-	list_for_each_entry(c, &clients, list) {
-		blob_buf_init(&b, 0);
-		blobmsg_add_string(&b, "msg", l->data);
-		blobmsg_add_u32(&b, "id", l->id);
-		blobmsg_add_u32(&b, "priority", l->priority);
-		blobmsg_add_u32(&b, "source", l->source);
-		blobmsg_add_u64(&b, "time", (((__u64) l->ts.tv_sec) * 1000) + (l->ts.tv_nsec / 1000000));
+	blob_buf_init(&b, 0);
+	blobmsg_add_string(&b, "msg", l->data);
+	blobmsg_add_u32(&b, "id", l->id);
+	blobmsg_add_u32(&b, "priority", l->priority);
+	blobmsg_add_u32(&b, "source", l->source);
+	blobmsg_add_u64(&b, "time", (((__u64) l->ts.tv_sec) * 1000) + (l->ts.tv_nsec / 1000000));
+
+	list_for_each_entry(c, &clients, list)
 		ustream_write(&c->s.stream, (void *) b.head, blob_len(b.head) + sizeof(struct blob_attr), false);
-	}
+
+	blob_buf_free(&b);
 }
 
 static void
@@ -165,8 +166,10 @@ ubus_connect_handler(struct ubus_context *ctx)
 	int ret;
 
 	ret = ubus_add_object(ctx, &log_object);
-	if (ret)
+	if (ret) {
 		fprintf(stderr, "Failed to add object: %s\n", ubus_strerror(ret));
+		exit(1);
+	}
 	fprintf(stderr, "log: connected to ubus\n");
 }