From 47ffe75848f216568ce3db0a60ca88cfe3d6903a Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Tue, 8 Dec 2009 01:31:53 +1030 Subject: [PATCH] ctdb: support --machinereadable (-Y) for scriptstatus Signed-off-by: Rusty Russell --- tools/ctdb.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/tools/ctdb.c b/tools/ctdb.c index ae6438e8..c9b0d78d 100644 --- a/tools/ctdb.c +++ b/tools/ctdb.c @@ -740,7 +740,11 @@ static int control_scriptstatus(struct ctdb_context *ctdb, int argc, const char return ret; } - printf("%d scripts were executed last monitoring cycle\n", script_status->num_scripts); + if (options.machinereadable) { + printf(":Name:Code:Status:Start:End:Error Output...:\n"); + } else { + printf("%d scripts were executed last monitoring cycle\n", script_status->num_scripts); + } for (i=0; inum_scripts; i++) { const char *status = NULL; @@ -759,6 +763,18 @@ static int control_scriptstatus(struct ctdb_context *ctdb, int argc, const char status = "ERROR"; break; } + if (options.machinereadable) { + printf("%s:%i:%s:%lu.%06lu:%lu.%06lu:%s:\n", + script_status->scripts[i].name, + script_status->scripts[i].status, + status, + (long)script_status->scripts[i].start.tv_sec, + (long)script_status->scripts[i].start.tv_usec, + (long)script_status->scripts[i].finished.tv_sec, + (long)script_status->scripts[i].finished.tv_usec, + script_status->scripts[i].output); + continue; + } if (status) printf("%-20s Status:%s ", script_status->scripts[i].name, status); -- 2.34.1