summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Klishin <mklishin@pivotal.io>2019-01-28 16:29:12 +0300
committerMichael Klishin <mklishin@pivotal.io>2019-01-28 16:29:12 +0300
commit57ca9b00105f9156d35f0418280177709249589d (patch)
tree8a1ad5dd7acf74b9820e742de8bf88f6bdfb8d1b
parent9be6dc0717cc0caa615d28d39113d81ec9008df7 (diff)
downloadrabbitmq-server-git-57ca9b00105f9156d35f0418280177709249589d.tar.gz
rabbit:await_startup/{0,1,2}: move spec definitions to definition
-rw-r--r--src/rabbit.erl11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl
index 24e2c0502c..de32ff82cf 100644
--- a/src/rabbit.erl
+++ b/src/rabbit.erl
@@ -255,10 +255,6 @@
-spec stop() -> 'ok'.
-spec stop_and_halt() -> no_return().
--spec await_startup() -> 'ok' | {'error', 'timeout'}.
--spec await_startup(node() | non_neg_integer()) -> 'ok' | {'error', 'timeout'}.
--spec await_startup(node(), non_neg_integer()) -> 'ok' | {'error', 'timeout'}.
-
-spec status
() -> [{pid, integer()} |
{running_applications, [{atom(), string(), string()}]} |
@@ -701,9 +697,14 @@ is_booting(Node) ->
P when is_pid(P) -> true
end.
+
+-spec await_startup() -> 'ok' | {'error', 'timeout'}.
+
await_startup() ->
await_startup(node()).
+-spec await_startup(node() | non_neg_integer()) -> 'ok' | {'error', 'timeout'}.
+
await_startup(Timeout) when is_integer(Timeout) ->
await_startup(node(), Timeout);
await_startup(Node) when is_atom(Node) ->
@@ -717,6 +718,8 @@ await_startup(Node) when is_atom(Node) ->
end
end.
+-spec await_startup(node(), non_neg_integer()) -> 'ok' | {'error', 'timeout'}.
+
await_startup(Node, Timeout) ->
case is_booting(Node) of
true -> wait_for_boot_to_finish(Node, Timeout);