diff options
| author | Matthew Sackman <matthew@lshift.net> | 2009-12-15 10:57:11 +0000 |
|---|---|---|
| committer | Matthew Sackman <matthew@lshift.net> | 2009-12-15 10:57:11 +0000 |
| commit | 33f9c618daa53f6d5e6966c2d0d9b0764adf1712 (patch) | |
| tree | 135a7d0bc4115b1e109b993e5bfa37a289bc78b6 /src | |
| parent | 0a9c2d9b0a17289cf8556614a6c4642f8bc3045f (diff) | |
| download | rabbitmq-server-git-33f9c618daa53f6d5e6966c2d0d9b0764adf1712.tar.gz | |
Do not kill rabbit after 1 second when being asked to stop. Also, the default timeout on startup should be the max value allowed, not 30 seconds. Sheesh.
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit.erl | 8 | ||||
| -rw-r--r-- | src/rabbit_multi.erl | 4 |
2 files changed, 2 insertions, 10 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index 9ef49ac598..401f20bafe 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -90,14 +90,6 @@ 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. status() -> diff --git a/src/rabbit_multi.erl b/src/rabbit_multi.erl index f364872eca..2fc7dcd1a2 100644 --- a/src/rabbit_multi.erl +++ b/src/rabbit_multi.erl @@ -50,8 +50,8 @@ start() -> RpcTimeout = case init:get_argument(maxwait) of - {ok,[[N1]]} -> 1000 * list_to_integer(N1); - _ -> 30000 + {ok, [[N1]]} -> 1000 * list_to_integer(N1); + _ -> 16#ffffffff %% max allowed value according to docs end, case init:get_plain_arguments() of [] -> |