summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Sackman <matthew@rabbitmq.com>2011-06-28 15:41:23 +0100
committerMatthew Sackman <matthew@rabbitmq.com>2011-06-28 15:41:23 +0100
commiteab449af808d625237a50b304a6c1ced68476770 (patch)
tree909fad9a867c8d42e794b36caedd696d0cbeac21
parentaa50d37b089a47bd75c9bc27b0ccf68baa456bc6 (diff)
downloadrabbitmq-server-eab449af808d625237a50b304a6c1ced68476770.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
-rw-r--r--src/rabbit.erl6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl
index af9cb472..16b8ac19 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() ->