From: Sebastian Harl <sh@tokkee.org>
Date: Tue, 16 Sep 2014 16:48:57 +0000 (+0200)
Subject: frontend/proto: Include the log priority in LOG messages.
X-Git-Tag: sysdb-0.5.0~35
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ccfc35aa9bef471b1cb76c33b3aca2b4874f982b;p=sysdb.git

frontend/proto: Include the log priority in LOG messages.

The priority is encoded as 32 bit integer in network byte order and added as a
separate field before the actual log message.

The 'sysdb' client now handles LOG messages accordingly and prefixes the
message with a string describing the priority.
---

diff --git a/src/frontend/connection.c b/src/frontend/connection.c
index a741401..a8dfeee 100644
--- a/src/frontend/connection.c
+++ b/src/frontend/connection.c
@@ -222,6 +222,10 @@ static int
 connection_log(int prio, const char *msg,
 		sdb_object_t __attribute__((unused)) *user_data)
 {
+	uint32_t len = (uint32_t)sizeof(uint32_t) + (uint32_t)strlen(msg);
+	uint32_t p = htonl((uint32_t)prio);
+	char tmp[len + 1];
+
 	sdb_conn_t *conn;
 
 	conn = sdb_conn_get_ctx();
@@ -234,9 +238,10 @@ connection_log(int prio, const char *msg,
 	if (prio >= SDB_LOG_DEBUG)
 		return 0;
 
-	/* TODO: Use CONNECTION_LOG_<prio>? */
-	if (sdb_connection_send(conn, CONNECTION_LOG,
-				(uint32_t)strlen(msg), msg) < 0)
+	memcpy(tmp, &p, sizeof(p));
+	strcpy(tmp + sizeof(p), msg);
+
+	if (sdb_connection_send(conn, CONNECTION_LOG, len, tmp) < 0)
 		return -1;
 	return 0;
 } /* connection_log */
diff --git a/src/include/frontend/proto.h b/src/include/frontend/proto.h
index feac946..2fabad5 100644
--- a/src/include/frontend/proto.h
+++ b/src/include/frontend/proto.h
@@ -85,14 +85,16 @@ typedef enum {
 	/*
 	 * CONNECTION_LOG:
 	 * Indicates an asynchronous log message. The message body will contain
-	 * the message string providing informational or warning logs. Log
-	 * messages may be sent to the client any time.
+	 * the log priority (see utils/error.h) and message. Log messages may be
+	 * sent to the client any time.
 	 *
 	 * 0               32              64
 	 * +---------------+---------------+
 	 * | message type  | length        |
 	 * +---------------+---------------+
-	 * | log message ...               |
+	 * | log priority  | log message   |
+	 * +---------------+               |
+	 * | ...                           |
 	 */
 	CONNECTION_LOG,
 
diff --git a/src/tools/sysdb/command.c b/src/tools/sysdb/command.c
index 718309b..d30ec60 100644
--- a/src/tools/sysdb/command.c
+++ b/src/tools/sysdb/command.c
@@ -29,11 +29,14 @@
 #	include "config.h"
 #endif /* HAVE_CONFIG_H */
 
+#include "sysdb.h"
+
 #include "tools/sysdb/command.h"
 #include "tools/sysdb/input.h"
 
 #include "frontend/proto.h"
 #include "utils/error.h"
+#include "utils/proto.h"
 #include "utils/strbuf.h"
 
 #include <errno.h>
@@ -43,6 +46,45 @@
 #include <stdlib.h>
 #include <string.h>
 
+static void
+log_printer(sdb_strbuf_t *buf)
+{
+	uint32_t prio = sdb_proto_get_int(buf, 0);
+
+	if (prio == UINT32_MAX) {
+		printf("ERROR: Received a LOG message with invalid "
+				"or missing priority\n");
+		return;
+	}
+	sdb_strbuf_skip(buf, 0, sizeof(prio));
+
+	printf("%s: %s\n", SDB_LOG_PRIO_TO_STRING((int)prio),
+			sdb_strbuf_string(buf));
+} /* log_printer */
+
+static void
+data_printer(sdb_strbuf_t *buf)
+{
+	if (sdb_strbuf_len(buf) <= sizeof(uint32_t)) {
+		printf("ERROR: Received a DATA message with invalid "
+				"or missing data-type\n");
+		return;
+	}
+
+	/* At the moment, we don't care about the result type. We simply print the
+	 * result without further parsing it. */
+	sdb_strbuf_skip(buf, 0, sizeof(uint32_t));
+	printf("%s\n", sdb_strbuf_string(buf));
+} /* data_printer */
+
+static struct {
+	int status;
+	void (*printer)(sdb_strbuf_t *);
+} response_printers[] = {
+	{ CONNECTION_LOG,  log_printer },
+	{ CONNECTION_DATA, data_printer },
+};
+
 /*
  * public API
  */
@@ -53,7 +95,9 @@ sdb_command_print_reply(sdb_client_t *client)
 	sdb_strbuf_t *recv_buf;
 	const char *result;
 	uint32_t rcode = 0;
+
 	int status = 0;
+	size_t i;
 
 	recv_buf = sdb_strbuf_create(1024);
 	if (! recv_buf)
@@ -74,11 +118,15 @@ sdb_command_print_reply(sdb_client_t *client)
 	else
 		status = (int)rcode;
 
+	for (i = 0; i < SDB_STATIC_ARRAY_LEN(response_printers); ++i) {
+		if (status == response_printers[i].status) {
+			response_printers[i].printer(recv_buf);
+			sdb_strbuf_destroy(recv_buf);
+			return status;
+		}
+	}
+
 	result = sdb_strbuf_string(recv_buf);
-	/* At the moment, we don't care about the result type. We simply print the
-	 * result without further parsing it. */
-	if (status == CONNECTION_DATA)
-		result += sizeof(uint32_t);
 	if (result && *result)
 		printf("%s\n", result);
 	else if (rcode == UINT32_MAX) {