diff options
| author | Matthias Radestock <matthias@lshift.net> | 2010-03-08 17:24:36 +0000 |
|---|---|---|
| committer | Matthias Radestock <matthias@lshift.net> | 2010-03-08 17:24:36 +0000 |
| commit | 107adaa41c70b749999cf97a4f7c5f0234ed10a1 (patch) | |
| tree | 000c02625fb621c3f0cdafd9be187bdd1ed23ed1 /src/rabbit.erl | |
| parent | 347781cea7a6d528c60dffa6c9cdd0e5024e2d5c (diff) | |
| parent | fe2662ecf96313aa87804c70a17bb617e424e61e (diff) | |
| download | rabbitmq-server-git-107adaa41c70b749999cf97a4f7c5f0234ed10a1.tar.gz | |
merge bug22456 into default
Diffstat (limited to 'src/rabbit.erl')
| -rw-r--r-- | src/rabbit.erl | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index ee39100adb..700acede24 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -197,15 +197,12 @@ stop() -> ok = rabbit_misc:stop_applications(?APPS). stop_and_halt() -> - spawn(fun () -> - SleepTime = 1000, - rabbit_log:info("Stop-and-halt request received; " - "halting in ~p milliseconds~n", - [SleepTime]), - timer:sleep(SleepTime), - init:stop() - end), - case catch stop() of _ -> ok end. + try + stop() + after + init:stop() + end, + ok. status() -> [{running_applications, application:which_applications()}] ++ |