index 6ae4c89a981eff70cdf9fb8413f8211f6e90e9dc..c7ca310a086230268272b46dcb7c268733b106b8 100644 (file)
#include <stdlib.h>
#include <string.h>
+static void
+ok_printer(sdb_strbuf_t *buf)
+{
+ const char *msg = sdb_strbuf_string(buf);
+ if (msg && *msg)
+ printf("%s\n", msg);
+ else
+ printf("OK\n");
+} /* ok_printer */
+
static void
log_printer(sdb_strbuf_t *buf)
{
- uint32_t prio = sdb_proto_get_int(buf, 0);
+ uint32_t prio = 0;
- if (prio == UINT32_MAX) {
- printf("ERROR: Received a LOG message with invalid "
- "or missing priority\n");
- return;
+ 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
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;
}
int status;
void (*printer)(sdb_strbuf_t *);
} response_printers[] = {
+ { SDB_CONNECTION_OK, ok_printer },
{ SDB_CONNECTION_LOG, log_printer },
{ SDB_CONNECTION_DATA, data_printer },
};
const char *result;
uint32_t rcode = 0;
- int status = 0;
+ int status = -1;
size_t i;
recv_buf = sdb_strbuf_create(1024);
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) {
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);
break;
}
- if ((status == SDB_CONNECTION_DATA)
+ if ((status == SDB_CONNECTION_OK)
+ || (status == SDB_CONNECTION_DATA)
|| (status == SDB_CONNECTION_ERROR))
break;
}
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 : */