diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2009-12-08 01:31:53 +1030 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2009-12-08 01:31:53 +1030 |
| commit | 9e87377e7a0164757cd437f5b19698dc44a64c21 (patch) | |
| tree | d2f5931d9677776e0e8adc9b2b366e9217cfffd7 /ctdb/tools | |
| parent | b29067b02f34d94aba832cbd1c14591a06058a38 (diff) | |
| download | samba-9e87377e7a0164757cd437f5b19698dc44a64c21.tar.gz samba-9e87377e7a0164757cd437f5b19698dc44a64c21.tar.xz samba-9e87377e7a0164757cd437f5b19698dc44a64c21.zip | |
ctdb: support --machinereadable (-Y) for scriptstatus
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(This used to be ctdb commit 47ffe75848f216568ce3db0a60ca88cfe3d6903a)
Diffstat (limited to 'ctdb/tools')
| -rw-r--r-- | ctdb/tools/ctdb.c | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/ctdb/tools/ctdb.c b/ctdb/tools/ctdb.c index ae6438e85c..c9b0d78dcd 100644 --- a/ctdb/tools/ctdb.c +++ b/ctdb/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; i<script_status->num_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); |