Gitweb:
http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: be85fb73dc459c5574ac7b50e0fea903f38ad15e
Parent: 2960cc2fe8ae35824e570fb774feb4b8386d982e
Author: Lon Hohberger <lhh(a)redhat.com>
AuthorDate: Thu Aug 5 14:58:18 2010 -0400
Committer: Lon Hohberger <lhh(a)redhat.com>
CommitterDate: Mon Jan 31 17:32:10 2011 -0500
rgmanager: Fix clustat return code
If rgmanager was not running, clustat would return -1 (255)
Resolves: rhbz#621562
Signed-off-by: Lon Hohberger <lhh(a)redhat.com>
---
rgmanager/src/utils/clustat.c | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/rgmanager/src/utils/clustat.c b/rgmanager/src/utils/clustat.c
index f56d3f5..6c4f953 100644
--- a/rgmanager/src/utils/clustat.c
+++ b/rgmanager/src/utils/clustat.c
@@ -867,7 +867,7 @@ txt_cluster_status(cman_cluster_t *ci,
rg_state_list_t *rgs, char *name, char *svcname,
int flags)
{
- int ret = 0;
+ int ret1 = 0, ret2 = 0;
if (!svcname && !name) {
txt_cluster_info(ci);
@@ -879,14 +879,18 @@ txt_cluster_status(cman_cluster_t *ci,
}
}
- if (!svcname || (name && svcname))
- ret = txt_member_states(membership, name);
- if (name && !svcname)
- return ret;
- if (!name || (name && svcname))
- ret = txt_rg_states(rgs, membership, svcname, flags);
-
- return ret;
+ if (!svcname || (name && svcname))
+ ret1 = txt_member_states(membership, name);
+
+ if (rgs &&
+ (!name || (name && svcname)))
+ ret2 = txt_rg_states(rgs, membership, svcname, flags);
+
+ if (name && ret1)
+ return ret1;
+ if (svcname && ret2)
+ return ret2;
+ return 0;
}