[PATCH 2/3] quorumtools: fix nodes display on status

["Fabio M. Di Nitto" <fdinitto@xxxxxxxxxx>]

From: "Fabio M. Di Nitto" <fdinitto@xxxxxxxxxx>

Signed-off-by: Fabio M. Di Nitto <fdinitto@xxxxxxxxxx>
---
 tools/corosync-quorumtool.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/tools/corosync-quorumtool.c b/tools/corosync-quorumtool.c
index 48266b2..ff13cdf 100644
--- a/tools/corosync-quorumtool.c
+++ b/tools/corosync-quorumtool.c
@@ -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);
-- 
1.7.7.6

_______________________________________________
discuss mailing list
discuss@xxxxxxxxxxxx
http://lists.corosync.org/mailman/listinfo/discuss