]> git.proxmox.com Git - mirror_corosync.git/commitdiff
quorumtools: fix nodes display on status
authorFabio M. Di Nitto <fdinitto@redhat.com>
Fri, 3 Feb 2012 08:58:01 +0000 (09:58 +0100)
committerFabio M. Di Nitto <fdinitto@redhat.com>
Fri, 3 Feb 2012 09:33:33 +0000 (10:33 +0100)
Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
Reviewed-by: Christine Caulfield <ccaulfie@redhat.com>
tools/corosync-quorumtool.c

index 48266b245dc0d22b710dd5b20ab5f6eeaf68ec95..ff13cdf8014c0fe2a623641db06e58722e696f90 100644 (file)
@@ -355,7 +355,7 @@ static int display_quorum_data(int is_quorate, int loop)
  *         0 if not quorate
  *        -1 on error
  */
-static int show_status(void)
+static int show_status(nodeid_format_t nodeid_format, name_format_t name_format)
 {
        int is_quorate;
        int err;
@@ -390,10 +390,11 @@ quorum_err:
        }
 
        err = display_quorum_data(is_quorate, 0);
-
        if (err != CS_OK) {
                return err;
        }
+       display_nodes_data(nodeid_format, name_format);
+
        return is_quorate;
 }
 
@@ -402,7 +403,7 @@ static int monitor_status(nodeid_format_t nodeid_format, name_format_t name_form
        int loop = 0;
 
        if (q_type == QUORUM_FREE) {
-               show_status();
+               show_status(nodeid_format, name_format);
                printf("\nQuorum is not configured - cannot monitor\n");
                return 0;
        }
@@ -606,7 +607,7 @@ int main (int argc, char *argv[]) {
                ret = show_nodes(nodeid_format, address_format);
                break;
        case CMD_SHOWSTATUS:
-               ret = show_status();
+               ret = show_status(nodeid_format, address_format);
                break;
        case CMD_SETVOTES:
                ret = set_votes(nodeid, votes);