Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=35c... Commit: 35ca5c614daea853ffe49b7111b68472d4848dd3 Parent: 07619f61398738c60d6f9265f99987ba2573f581 Author: Lon Hohberger lhh@redhat.com AuthorDate: Wed Aug 25 14:34:59 2010 -0400 Committer: Lon Hohberger lhh@redhat.com CommitterDate: Fri Sep 24 18:17:21 2010 -0400
rgmanager: Present all flags in clustat output
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 d400d32..2b47306 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;
@@ -484,10 +485,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,
cluster-commits@lists.fedorahosted.org