diff options
| author | Matthew Sackman <matthew@rabbitmq.com> | 2011-06-28 15:41:23 +0100 |
|---|---|---|
| committer | Matthew Sackman <matthew@rabbitmq.com> | 2011-06-28 15:41:23 +0100 |
| commit | f5532d9d6f264f2247e72e9f821a37f2fa20133b (patch) | |
| tree | 909fad9a867c8d42e794b36caedd696d0cbeac21 /src/rabbit.erl | |
| parent | 72d8ef41731c27518bab52eea4aad13bfa02983b (diff) | |
| download | rabbitmq-server-git-f5532d9d6f264f2247e72e9f821a37f2fa20133b.tar.gz | |
Finally, just to be really safe, avoid init:stop as far as we sensibly can on stop_and_halt as we know that does the wrong thing should applications have been manually stopped and restarted
Diffstat (limited to 'src/rabbit.erl')
| -rw-r--r-- | src/rabbit.erl | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index af9cb472e0..16b8ac197e 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -211,7 +211,11 @@ stop() -> ok = rabbit_misc:stop_applications(application_load_order()). stop_and_halt() -> - init:stop(), + try + stop() + after + init:stop() + end, ok. status() -> |