diff options
| author | David Wragg <dpw@lshift.net> | 2009-08-20 14:34:59 +0100 |
|---|---|---|
| committer | David Wragg <dpw@lshift.net> | 2009-08-20 14:34:59 +0100 |
| commit | beea3ad2a7cce52b2a90bd49c01d41856ef33ef3 (patch) | |
| tree | 1c4191e1f57726912c015b1baf53eecc5f649910 /packaging/common | |
| parent | dd56a8132e6076e8690e5cb1fba2da567fbb2997 (diff) | |
| download | rabbitmq-server-git-beea3ad2a7cce52b2a90bd49c01d41856ef33ef3.tar.gz | |
Hg overestimated its ability to handle a merge
Diffstat (limited to 'packaging/common')
| -rw-r--r-- | packaging/common/rabbitmq-server.init | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/packaging/common/rabbitmq-server.init b/packaging/common/rabbitmq-server.init index 3c400376fb..e71562f834 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 |