merge bug22456 into default

8 files changed, 23 insertions, 20 deletions

diff --git a/include/rabbit.hrl b/include/rabbit.hrl
index e2980eff..38142491 100644
--- a/include/rabbit.hrl
+++ b/include/rabbit.hrl
@@ -173,6 +173,8 @@
 -define(COPYRIGHT_MESSAGE, "Copyright (C) 2007-2010 LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd.").
 -define(INFORMATION_MESSAGE, "Licensed under the MPL.  See http://www.rabbitmq.com/").
 
+-define(MAX_WAIT, 16#ffffffff).
+
 -ifdef(debug).
 -define(LOGDEBUG0(F), rabbit_log:debug(F)).
 -define(LOGDEBUG(F,A), rabbit_log:debug(F,A)).
diff --git a/src/pg_local.erl b/src/pg_local.erl
index fa41fe46..1501331d 100644
--- a/src/pg_local.erl
+++ b/src/pg_local.erl
@@ -206,7 +206,7 @@ ensure_started() ->
     case whereis(?MODULE) of
         undefined ->
             C = {pg_local, {?MODULE, start_link, []}, permanent,
-                 1000, worker, [?MODULE]},
+                 16#ffffffff, worker, [?MODULE]},
             supervisor:start_child(kernel_safe_sup, C);
         PgLocalPid ->
             {ok, PgLocalPid}
diff --git a/src/rabbit.erl b/src/rabbit.erl
index ee39100a..700acede 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()}] ++
diff --git a/src/rabbit_alarm.erl b/src/rabbit_alarm.erl
index e5559b46..7e96d9a3 100644
--- a/src/rabbit_alarm.erl
+++ b/src/rabbit_alarm.erl
@@ -57,11 +57,9 @@ start() ->
     ok = alarm_handler:add_alarm_handler(?MODULE, []),
     {ok, MemoryWatermark} = application:get_env(vm_memory_high_watermark),
     ok = case MemoryWatermark == 0 of
-             true ->
-                 ok;
-             false ->
-                 rabbit_sup:start_restartable_child(vm_memory_monitor,
-                                                    [MemoryWatermark])
+             true  -> ok;
+             false -> rabbit_sup:start_restartable_child(vm_memory_monitor,
+                                                         [MemoryWatermark])
          end,
     ok.
 
diff --git a/src/rabbit_multi.erl b/src/rabbit_multi.erl
index 8c898498..7c56ae3d 100644
--- a/src/rabbit_multi.erl
+++ b/src/rabbit_multi.erl
@@ -51,7 +51,7 @@ start() ->
     RpcTimeout =
         case init:get_argument(maxwait) of
             {ok,[[N1]]} -> 1000 * list_to_integer(N1);
-            _ -> 30000
+            _           -> ?MAX_WAIT
         end,
     case init:get_plain_arguments() of
         [] ->
diff --git a/src/rabbit_restartable_sup.erl b/src/rabbit_restartable_sup.erl
index 2813fd15..06d59249 100644
--- a/src/rabbit_restartable_sup.erl
+++ b/src/rabbit_restartable_sup.erl
@@ -37,8 +37,11 @@
 
 -export([init/1]).
 
+-include("rabbit.hrl").
+
 start_link(Name, {_M, _F, _A} = Fun) ->
     supervisor:start_link({local, Name}, ?MODULE, [Fun]).
 
 init([{Mod, _F, _A} = Fun]) ->
-    {ok, {{one_for_one, 10, 10}, [{Mod, Fun, transient, 100, worker, [Mod]}]}}.
+    {ok, {{one_for_one, 10, 10},
+          [{Mod, Fun, transient, ?MAX_WAIT, worker, [Mod]}]}}.
diff --git a/src/rabbit_sup.erl b/src/rabbit_sup.erl
index c3d1037e..25715e6e 100644
--- a/src/rabbit_sup.erl
+++ b/src/rabbit_sup.erl
@@ -38,6 +38,8 @@
 
 -export([init/1]).
 
+-include("rabbit.hrl").
+
 -define(SERVER, ?MODULE).
 
 start_link() ->
@@ -47,8 +49,9 @@ start_child(Mod) ->
     start_child(Mod, []).
 
 start_child(Mod, Args) ->
-    {ok, _} = supervisor:start_child(?SERVER, {Mod, {Mod, start_link, Args},
-                                               transient, 100, worker, [Mod]}),
+    {ok, _} = supervisor:start_child(?SERVER,
+                                     {Mod, {Mod, start_link, Args},
+                                      transient, ?MAX_WAIT, worker, [Mod]}),
     ok.
 
 start_restartable_child(Mod) ->
diff --git a/src/tcp_listener_sup.erl b/src/tcp_listener_sup.erl
index 0fe15426..493925ef 100644
--- a/src/tcp_listener_sup.erl
+++ b/src/tcp_listener_sup.erl
@@ -63,4 +63,4 @@ init({IPAddress, Port, SocketOpts, OnStartup, OnShutdown,
                            [IPAddress, Port, SocketOpts,
                             ConcurrentAcceptorCount, Name,
                             OnStartup, OnShutdown, Label]},
-            transient, 100, worker, [tcp_listener]}]}}.
+            transient, 16#ffffffff, worker, [tcp_listener]}]}}.