sysdb: Don't pretty-print JSON in non-interactive mode.

[sysdb.git] / src / tools / sysdb / command.c

diff --git a/src/tools/sysdb/command.c b/src/tools/sysdb/command.c
index 78deb717520be48a95d37808b8b3830e32ec73db..dd8b2980c7ca6efb784bd7c6e8a889618d207596 100644 (file)
--- 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,11 +48,21 @@
 #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_unmarshal_int(SDB_STRBUF_STR(buf));
+       const char *msg = sdb_strbuf_string(buf);
+       if (msg && *msg)
+               printf("%s\n", msg);
+       else
+               printf("OK\n");
+} /* ok_printer */
 
-       if (prio == UINT32_MAX) {
+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;
@@ -62,7 +73,7 @@ log_printer(sdb_strbuf_t *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);
 
@@ -79,13 +90,16 @@ data_printer(sdb_strbuf_t *buf)
        /* 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));
+       if (sdb_json_print(input, 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 },
 };
@@ -104,7 +118,7 @@ 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;
@@ -117,10 +131,10 @@ sdb_command_print_reply(sdb_client_t *client)
        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;
        }
@@ -130,7 +144,7 @@ sdb_command_print_reply(sdb_client_t *client)
 
        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;
                }
@@ -189,13 +203,14 @@ sdb_command_exec(sdb_input_t *input)
        /* 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->client);
+               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_DATA)
+               if ((status == SDB_CONNECTION_OK)
+                               || (status == SDB_CONNECTION_DATA)
                                || (status == SDB_CONNECTION_ERROR))
                        break;
        }
@@ -203,5 +218,25 @@ sdb_command_exec(sdb_input_t *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 : */