diff options
| author | Matthew Sackman <matthew@lshift.net> | 2010-03-08 15:12:24 +0000 |
|---|---|---|
| committer | Matthew Sackman <matthew@lshift.net> | 2010-03-08 15:12:24 +0000 |
| commit | 2908a1ea8281ffbb426ffde3366fd93381288349 (patch) | |
| tree | 5e7dde5fef746505265381bc06a4b8c3c52034af /src/rabbit.erl | |
| parent | 43acb2b32a8952fbb731e3698a99c26876f278ce (diff) | |
| download | rabbitmq-server-git-2908a1ea8281ffbb426ffde3366fd93381288349.tar.gz | |
Extended all timeouts
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 94d852f921..326893ca22 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()}] ++ |