rabbit_control waits as long as process is alive

1 files changed, 4 insertions, 2 deletions

diff --git a/src/rabbit_control.erl b/src/rabbit_control.erl
index d9b2ae97b4..59df82b323 100644
--- a/src/rabbit_control.erl
+++ b/src/rabbit_control.erl
@@ -408,8 +408,10 @@ wait_for_application(Node, PidFile, Application, Inform) ->
 wait_for_application(Node, Pid, Application) ->
     case process_up(Pid) of
         true  -> case rpc:call(Node, rabbit, await_startup, []) of
-                     {badrpc, _} -> {error, node_not_responding};
-                     ok          -> ok
+                     ok          -> ok;
+                     Other       -> timer:sleep(?EXTERNAL_CHECK_INTERVAL),
+                                    wait_for_application(Node, Pid,
+                                                         Application)
                  end;
         false -> {error, process_not_running}
     end.