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

diff --git a/log/logd.c b/log/logd.c
index e4f9b3f..8cebeb8 100644
--- a/log/logd.c
+++ b/log/logd.c
@@ -58,12 +58,11 @@ client_close(struct ustream *s)
 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
@@ -83,7 +82,10 @@ 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;
@@ -98,7 +100,7 @@ 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)
 			break;
@@ -165,8 +167,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");
 }