# HG changeset patch
# User Florian Haas <[email protected]>
# Date 1287507837 -7200
# Node ID f238c087b79730a64f576b62c10e7cbcb638d000
# Parent 50a340003ffe0310c08425b73c141e96c42b468f
Low: ManageVE: exit, don't return, on error
diff -r 50a340003ffe -r f238c087b797 heartbeat/ManageVE
--- a/heartbeat/ManageVE Fri Oct 15 16:58:07 2010 +0200
+++ b/heartbeat/ManageVE Tue Oct 19 19:03:57 2010 +0200
@@ -115,7 +115,7 @@
veexists=`$VZCTL status $VEID 2>/dev/null | $AWK '{print $3}'`
if [[ $veexists != "exist" ]]; then
ocf_log err "vzctl status $VEID returned: $VEID does not exist."
- return $OCF_ERR_INSTALLED
+ exit $OCF_ERR_INSTALLED
fi
status_ve
@@ -132,7 +132,7 @@
if [[ $retcode != 0 && $retcode != 32 ]]; then
ocf_log err "vzctl start $VEID returned: $retcode"
- return $OCF_ERR_GENERIC
+ exit $OCF_ERR_GENERIC
fi
return $OCF_SUCCESS
@@ -156,7 +156,7 @@
if [[ $retcode != 0 ]]; then
ocf_log err "vzctl stop $VEID returned: $retcode"
- return $OCF_ERR_GENERIC
+ exit $OCF_ERR_GENERIC
fi
return $OCF_SUCCESS
@@ -180,7 +180,7 @@
if [[ $retcode != 0 ]]; then
ocf_log err "vzctl status $VEID returned: $retcode"
- return $OCF_ERR_GENERIC
+ exit $OCF_ERR_GENERIC
fi
if [[ $veexists != "exist" ]]; then
@@ -197,7 +197,7 @@
;;
*)
ocf_log err "vzctl status $VEID, wrong output format. (5th column:
$vestatus)"
- return $OCF_ERR_GENERIC
+ exit $OCF_ERR_GENERIC
;;
esac
}
_______________________________________________________
Linux-HA-Dev: [email protected]
http://lists.linux-ha.org/mailman/listinfo/linux-ha-dev
Home Page: http://linux-ha.org/
