From d826bd7fd129f80601a2b33cadc8f1d32f4f8e69 Mon Sep 17 00:00:00 2001 From: Lon Hohberger <lhh@redhat.com> Date: Wed, 25 Aug 2010 14:34:59 -0400 Subject: [PATCH] rgmanager: Present all flags in clustat output Resolves: rhbz#605733 Signed-off-by: Lon Hohberger <lhh@redhat.com> --- rgmanager/src/utils/clustat.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/rgmanager/src/utils/clustat.c b/rgmanager/src/utils/clustat.c index 2f58d5a..567fe2c 100644 --- a/rgmanager/src/utils/clustat.c +++ b/rgmanager/src/utils/clustat.c @@ -455,6 +455,7 @@ _txt_rg_state(rg_state_t *rs, cluster_member_list_t *members, int flags, { char owner[MAXHOSTNAMELEN+1]; char state_string[255] = ""; + char flags_string[16] = ""; char *name = rs->rs_name, *ptr; int l; @@ -485,10 +486,14 @@ _txt_rg_state(rg_state_t *rs, cluster_member_list_t *members, int flags, } /* Show a frozen service */ - if (rs->rs_flags & RG_FLAG_FROZEN) { + if (rs->rs_flags) { + rg_flags_str(flags_string, sizeof(flags_string), rs->rs_flags, + NULL); + snprintf(state_string, sizeof(state_string), - "%-*.*s[Z]", statsize-3, statsize-3, - rg_state_str(rs->rs_state)); + "%-*.*s[%s]", (int)(statsize-(2+strlen(flags_string))), + (int)(statsize-(2+strlen(flags_string))), + rg_state_str(rs->rs_state), flags_string); } else { snprintf(state_string, sizeof(state_string), "%-*.*s", statsize, statsize, -- 1.7.2.2