summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandru Scvortov <alexandru@rabbitmq.com>2010-06-07 13:42:51 +0100
committerAlexandru Scvortov <alexandru@rabbitmq.com>2010-06-07 13:42:51 +0100
commit5b85d08ce890c17d23d4c5508c9b83210537bd86 (patch)
tree7f603d805f0f7eee75fdcb3b68982356d02d27a6
parent8c298727ddf4517bfd3a64e5b7485ac7827adc06 (diff)
downloadrabbitmq-server-git-5b85d08ce890c17d23d4c5508c9b83210537bd86.tar.gz
merged Florian's 07 patch: OCF resource agent: add status operation
Even when it is identical to monitor, a status operation should still be advertised.
-rwxr-xr-xpackaging/common/rabbitmq-server.ocf5
1 files changed, 3 insertions, 2 deletions
diff --git a/packaging/common/rabbitmq-server.ocf b/packaging/common/rabbitmq-server.ocf
index 9e144dbfd8..3dcca705d0 100755
--- a/packaging/common/rabbitmq-server.ocf
+++ b/packaging/common/rabbitmq-server.ocf
@@ -162,6 +162,7 @@ Additional arguments provided to the server on startup
<actions>
<action name="start" timeout="600" />
<action name="stop" timeout="120" />
+<action name="status" timeout="20" interval="10" />
<action name="monitor" timeout="20" interval="10" depth="0" start-delay="0" />
<action name="validate-all" timeout="30" />
<action name="meta-data" timeout="5" />
@@ -172,7 +173,7 @@ END
rabbit_usage() {
cat <<END
-usage: $0 {start|stop|monitor|validate-all|meta-data}
+usage: $0 {start|stop|status|monitor|validate-all|meta-data}
Expects to have a fully populated OCF RA-compliant environment set.
END
@@ -356,7 +357,7 @@ case $__OCF_ACTION in
stop)
rabbit_stop
;;
- monitor)
+ status|monitor)
rabbit_monitor
;;
validate-all)