diff options
| author | Alexandru Scvortov <alexandru@rabbitmq.com> | 2010-06-07 12:25:03 +0100 |
|---|---|---|
| committer | Alexandru Scvortov <alexandru@rabbitmq.com> | 2010-06-07 12:25:03 +0100 |
| commit | d3b63bfd4603818f0ad60715d920f7f69726e584 (patch) | |
| tree | 1f639c76ed42adacd84cd587591ac9622b46cbda | |
| parent | a47109d0a8bc60d55d168cc7851aea80b6ddad6a (diff) | |
| download | rabbitmq-server-d3b63bfd4603818f0ad60715d920f7f69726e584.tar.gz | |
merged Florian's 03 patch
| -rwxr-xr-x | packaging/common/rabbitmq-server.ocf | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/packaging/common/rabbitmq-server.ocf b/packaging/common/rabbitmq-server.ocf index 542485bf..d8f8d0d3 100755 --- a/packaging/common/rabbitmq-server.ocf +++ b/packaging/common/rabbitmq-server.ocf @@ -259,10 +259,9 @@ rabbit_status() { rabbit_start() { local rc - rabbit_validate_full - rc=$? - if [ "$rc" != $OCF_SUCCESS ]; then - return $rc + if rabbit_status; then + ocf_log info "Resource already running." + return $OCF_SUCCESS fi export_vars @@ -296,6 +295,12 @@ rabbit_start() { rabbit_stop() { local rc + + if ! rabbit_status; then + ocf_log info "Resource not running." + return $OCF_SUCCESS + fi + $RABBITMQ_MULTI stop_all & rc=$? |