X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2Ftools%2Fsysdb%2Fcommand.c;h=61960be83505ca167e4045f6a225854b9aeb0946;hp=6c3114d8e692274d8223c7601c3082d5174b5fe2;hb=0a3dd5b9b97e25156412a95bcecf25f8d75c72fc;hpb=b6c730c2d0cf400127da5ca96b51abd4ad335c0c

diff --git a/src/tools/sysdb/command.c b/src/tools/sysdb/command.c
index 6c3114d..61960be 100644
--- a/src/tools/sysdb/command.c
+++ b/src/tools/sysdb/command.c
@@ -33,6 +33,7 @@
 
 #include "tools/sysdb/command.h"
 #include "tools/sysdb/input.h"
+#include "tools/sysdb/json.h"
 
 #include "frontend/proto.h"
 #include "utils/error.h"
@@ -47,46 +48,58 @@
 #include <string.h>
 
 static void
-log_printer(sdb_strbuf_t *buf)
+ok_printer(sdb_input_t __attribute__((unused)) *input, sdb_strbuf_t *buf)
 {
-	uint32_t prio = sdb_proto_get_int(buf, 0);
+	const char *msg = sdb_strbuf_string(buf);
+	if (msg && *msg)
+		printf("%s\n", msg);
+	else
+		printf("OK\n");
+} /* ok_printer */
 
-	if (prio == UINT32_MAX) {
-		printf("ERROR: Received a LOG message with invalid "
-				"or missing priority\n");
-		return;
+static void
+log_printer(sdb_input_t __attribute__((unused)) *input, sdb_strbuf_t *buf)
+{
+	uint32_t prio = 0;
+
+	if (sdb_proto_unmarshal_int32(SDB_STRBUF_STR(buf), &prio) < 0) {
+		sdb_log(SDB_LOG_WARNING, "Received a LOG message with invalid "
+				"or missing priority");
+		prio = (uint32_t)SDB_LOG_ERR;
 	}
 	sdb_strbuf_skip(buf, 0, sizeof(prio));
 
-	printf("%s: %s\n", SDB_LOG_PRIO_TO_STRING((int)prio),
-			sdb_strbuf_string(buf));
+	sdb_log((int)prio, "%s", sdb_strbuf_string(buf));
 } /* log_printer */
 
 static void
-data_printer(sdb_strbuf_t *buf)
+data_printer(sdb_input_t __attribute__((unused)) *input, sdb_strbuf_t *buf)
 {
 	size_t len = sdb_strbuf_len(buf);
+	uint32_t type = 0;
 
 	if ((! len) || (len == sizeof(uint32_t))) {
 		/* empty command or empty reply */
 		return;
 	}
 	else if (len < sizeof(uint32_t)) {
-		printf("ERROR: Received a DATA message with invalid "
-				"or missing data-type\n");
+		sdb_log(SDB_LOG_ERR, "Received a DATA message with invalid "
+				"or missing data-type");
 		return;
 	}
 
-	/* At the moment, we don't care about the result type. We simply print the
-	 * result without further parsing it. */
+	sdb_proto_unmarshal_int32(SDB_STRBUF_STR(buf), &type);
 	sdb_strbuf_skip(buf, 0, sizeof(uint32_t));
-	printf("%s\n", sdb_strbuf_string(buf));
+	if (sdb_json_print(input, (int)type, buf))
+		sdb_log(SDB_LOG_ERR, "Failed to print result");
+	printf("\n");
 } /* data_printer */
 
 static struct {
 	int status;
-	void (*printer)(sdb_strbuf_t *);
+	void (*printer)(sdb_input_t *, sdb_strbuf_t *);
 } response_printers[] = {
+	{ SDB_CONNECTION_OK,   ok_printer },
 	{ SDB_CONNECTION_LOG,  log_printer },
 	{ SDB_CONNECTION_DATA, data_printer },
 };
@@ -105,37 +118,33 @@ clear_query(sdb_input_t *input)
  */
 
 int
-sdb_command_print_reply(sdb_client_t *client)
+sdb_command_print_reply(sdb_input_t *input)
 {
 	sdb_strbuf_t *recv_buf;
 	const char *result;
 	uint32_t rcode = 0;
 
-	int status = 0;
+	int status = -1;
 	size_t i;
 
 	recv_buf = sdb_strbuf_create(1024);
 	if (! recv_buf)
 		return -1;
 
-	if (sdb_client_recv(client, &rcode, recv_buf) < 0)
+	if (sdb_client_recv(input->client, &rcode, recv_buf) < 0)
 		rcode = UINT32_MAX;
 
-	if (sdb_client_eof(client)) {
+	if (sdb_client_eof(input->client)) {
 		sdb_strbuf_destroy(recv_buf);
 		return -1;
 	}
 
-	if (rcode == UINT32_MAX) {
-		printf("ERROR: ");
-		status = -1;
-	}
-	else
+	if (rcode != UINT32_MAX)
 		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);
+			response_printers[i].printer(input, recv_buf);
 			sdb_strbuf_destroy(recv_buf);
 			return status;
 		}
@@ -143,10 +152,11 @@ sdb_command_print_reply(sdb_client_t *client)
 
 	result = sdb_strbuf_string(recv_buf);
 	if (result && *result)
-		printf("%s\n", result);
+		sdb_log(SDB_LOG_ERR, "%s", result);
 	else if (rcode == UINT32_MAX) {
 		char errbuf[1024];
-		printf("%s\n", sdb_strerror(errno, errbuf, sizeof(errbuf)));
+		sdb_log(SDB_LOG_ERR, "%s",
+				sdb_strerror(errno, errbuf, sizeof(errbuf)));
 	}
 
 	sdb_strbuf_destroy(recv_buf);
@@ -190,15 +200,43 @@ sdb_command_exec(sdb_input_t *input)
 
 	sdb_client_send(input->client, SDB_CONNECTION_QUERY, query_len, query);
 
-	/* The server will send back *something*, either error/log messages
-	 * and/or the reply to the query. Here, we don't care about what it
-	 * sends back. We'll wait for the first reply and then return to the
-	 * main loop which will handle any subsequent replies, including
-	 * eventually the reply to the query (if it's not the first reply). */
-	sdb_command_print_reply(input->client);
+	/* The server may send back log messages but will eventually reply to the
+	 * query, which is either DATA or ERROR. */
+	while (42) {
+		int status = sdb_command_print_reply(input);
+		if (status < 0) {
+			sdb_log(SDB_LOG_ERR, "Failed to read reply from server");
+			break;
+		}
+
+		if ((status == SDB_CONNECTION_OK)
+				|| (status == SDB_CONNECTION_DATA)
+				|| (status == SDB_CONNECTION_ERROR))
+			break;
+	}
 	clear_query(input);
 	return data;
 } /* sdb_command_exec */
 
+void
+sdb_command_print_server_version(sdb_input_t *input)
+{
+	sdb_strbuf_t *buf = sdb_strbuf_create(32);
+	uint32_t code = 0, version = 0;
+	const char *extra;
+
+	if ((sdb_client_rpc(input->client, SDB_CONNECTION_SERVER_VERSION,
+					0, NULL, &code, buf) < 0) || (code != SDB_CONNECTION_OK))
+		return;
+	if (sdb_strbuf_len(buf) < sizeof(version))
+		return;
+
+	sdb_proto_unmarshal_int32(SDB_STRBUF_STR(buf), &version);
+	extra = sdb_strbuf_string(buf) + sizeof(version);
+	sdb_log(SDB_LOG_INFO, "SysDB server %d.%d.%d%s",
+			SDB_VERSION_DECODE((int)version), extra);
+	sdb_strbuf_destroy(buf);
+} /* sdb_command_print_server_version */
+
 /* vim: set tw=78 sw=4 ts=4 noexpandtab : */