diff options
| author | Matthew Sackman <matthew@rabbitmq.com> | 2011-09-06 13:49:05 +0100 |
|---|---|---|
| committer | Matthew Sackman <matthew@rabbitmq.com> | 2011-09-06 13:49:05 +0100 |
| commit | 6e22a7a8636da06522165e0a6f2628288a9eab73 (patch) | |
| tree | f290e6b000174ee671a18f8645c1fe6b129b1d42 | |
| parent | 291c28ba9d292a05020ec3ef353dc1adfb6bdacf (diff) | |
| download | rabbitmq-server-git-6e22a7a8636da06522165e0a6f2628288a9eab73.tar.gz | |
When we stop, wipe out the directory rather than just the pid file. This avoids having to worry about how to remove the directory on package uninstall and also has the advantage of helping non-rabbit-packaged distributions
| -rw-r--r-- | packaging/common/rabbitmq-server.init | 2 | ||||
| -rwxr-xr-x | packaging/common/rabbitmq-server.ocf | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/packaging/common/rabbitmq-server.init b/packaging/common/rabbitmq-server.init index 1bffc70365..585fad5181 100644 --- a/packaging/common/rabbitmq-server.init +++ b/packaging/common/rabbitmq-server.init @@ -80,7 +80,7 @@ stop_rabbitmq () { RETVAL=$? set -e if [ $RETVAL = 0 ] ; then - rm -f $PID_FILE + rm -rf `dirname $PID_FILE` if [ -n "$LOCK_FILE" ] ; then rm -f $LOCK_FILE fi diff --git a/packaging/common/rabbitmq-server.ocf b/packaging/common/rabbitmq-server.ocf index a077ff161e..0739008c18 100755 --- a/packaging/common/rabbitmq-server.ocf +++ b/packaging/common/rabbitmq-server.ocf @@ -309,7 +309,7 @@ rabbit_stop() { rabbit_status rc=$? if [ "$rc" = $OCF_NOT_RUNNING ]; then - rm -f $RABBITMQ_PID_FILE + rm -rf `dirname ${RABBITMQ_PID_FILE}` stop_wait=0 break elif [ "$rc" != $OCF_SUCCESS ]; then |