summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDaniil Fedotov <dfedotov@pivotal.io>2017-07-21 08:07:33 +0100
committerDaniil Fedotov <dfedotov@pivotal.io>2017-07-21 08:07:33 +0100
commit7fa82b3d923a2c1179fb0ae460dde46e89414a5a (patch)
tree2bce0c4f72acdae70a1e7706571297fcef1e0a64 /src
parent0b8449036fa4340be769a988c107b67a55c9ad3c (diff)
downloadrabbitmq-server-git-7fa82b3d923a2c1179fb0ae460dde46e89414a5a.tar.gz
Fix return type of start_vhost
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_vhost_sup_sup.erl6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/rabbit_vhost_sup_sup.erl b/src/rabbit_vhost_sup_sup.erl
index 5f23218f9a..1d5db93fda 100644
--- a/src/rabbit_vhost_sup_sup.erl
+++ b/src/rabbit_vhost_sup_sup.erl
@@ -61,7 +61,7 @@ init([]) ->
start_on_all_nodes(VHost) ->
NodesStart = [ {Node, start_vhost(VHost, Node)}
|| Node <- rabbit_nodes:all_running() ],
- Failures = lists:filter(fun({_, ok}) -> false; (_) -> true end, NodesStart),
+ Failures = lists:filter(fun({_, {ok, _}}) -> false; (_) -> true end, NodesStart),
case Failures of
[] -> ok;
Errors -> {error, {failed_to_start_vhost_on_nodes, Errors}}
@@ -144,9 +144,9 @@ vhost_sup(VHost) ->
case vhost_sup_pid(VHost) of
no_pid ->
case start_vhost(VHost) of
- ok ->
+ {ok, Pid} ->
true = is_vhost_alive(VHost),
- ok;
+ {ok, Pid};
{error, {no_such_vhost, VHost}} ->
{error, {no_such_vhost, VHost}};
Error ->