sysdb: Do an attempt to reconnect on all user input.

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

diff --git a/src/tools/sysdb/command.c b/src/tools/sysdb/command.c
index 81f679233d969ccb203f5f938c07e6d5f98fd693..5044c0e5213aac42cb4456cd9dafe465264f4010 100644 (file)
--- a/src/tools/sysdb/command.c
+++ b/src/tools/sysdb/command.c
@@ -87,10 +87,18 @@ static struct {
        int status;
        void (*printer)(sdb_strbuf_t *);
 } response_printers[] = {
-       { CONNECTION_LOG,  log_printer },
-       { CONNECTION_DATA, data_printer },
+       { SDB_CONNECTION_LOG,  log_printer },
+       { SDB_CONNECTION_DATA, data_printer },
 };
 
+static void
+clear_query(sdb_input_t *input)
+{
+       sdb_strbuf_skip(input->input, 0, input->query_len);
+       input->tokenizer_pos -= input->query_len;
+       input->query_len = 0;
+} /* clear_query */
+
 /*
  * public API
  */
@@ -165,27 +173,33 @@ sdb_command_exec(sdb_input_t *input)
        while (query_len && (query[query_len - 1]) == '\n')
                --query_len;
 
+       if (sdb_client_eof(input->client)) {
+               if (sdb_input_reconnect()) {
+                       clear_query(input);
+                       return NULL;
+               }
+       }
+
        if (query_len) {
                data = strndup(query, query_len);
                /* ignore errors; we'll only hide the command from the caller */
 
-               sdb_client_send(input->client, CONNECTION_QUERY, query_len, query);
+               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). */
+               /* TODO: wait for the actual reply instead */
                if (sdb_command_print_reply(input->client) < 0) {
                        if (data)
                                free(data);
-                       return NULL;
+                       data = NULL;
                }
        }
 
-       sdb_strbuf_skip(input->input, 0, input->query_len);
-       input->tokenizer_pos -= input->query_len;
-       input->query_len = 0;
+       clear_query(input);
        return data;
 } /* sdb_command_exec */