summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Wragg <dpw@lshift.net>2009-08-20 14:34:59 +0100
committerDavid Wragg <dpw@lshift.net>2009-08-20 14:34:59 +0100
commitf73b2c489c444baf2b2070a3f91943b5501de4ce (patch)
tree1c4191e1f57726912c015b1baf53eecc5f649910
parent44814598696a6753f2fa6359c658a3621ba2614f (diff)
downloadrabbitmq-server-bug19973.tar.gz
Hg overestimated its ability to handle a mergebug19973
-rw-r--r--packaging/common/rabbitmq-server.init3
1 files changed, 1 insertions, 2 deletions
diff --git a/packaging/common/rabbitmq-server.init b/packaging/common/rabbitmq-server.init
index 3c400376..e71562f8 100644
--- a/packaging/common/rabbitmq-server.init
+++ b/packaging/common/rabbitmq-server.init
@@ -67,10 +67,9 @@ stop_rabbitmq () {
if [ $RETVAL = 0 ] ; then
# Try to stop epmd if run by the rabbitmq user
pkill -u rabbitmq epmd || :
+ [ -n "$LOCK_FILE" ] && rm -rf $LOCK_FILE
else
echo FAILED - check /var/log/rabbitmq/shutdown_log, _err
- else
- [ -n "$LOCK_FILE" ] && rm -rf $LOCK_FILE
fi
else
echo No nodes running