diff options
| author | Michael Klishin <michael@novemberain.com> | 2017-09-11 21:29:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-11 21:29:45 -0400 |
| commit | 0527df37562453b20227ebafd2b49770f1f26eb4 (patch) | |
| tree | 37b5fa48b73319a9a43bdefab922e3bba4b624b4 /src | |
| parent | bee9a4238e2731a6bf371481056f02a940c1beb4 (diff) | |
| parent | 920c12443f6353bc63703497ae438ef30950aded (diff) | |
| download | rabbitmq-server-git-0527df37562453b20227ebafd2b49770f1f26eb4.tar.gz | |
Merge pull request #1357 from rabbitmq/rabbitmq-server-1356
Do not start direct connections if the direct connection supervisor is not started
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_direct.erl | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/src/rabbit_direct.erl b/src/rabbit_direct.erl index 3c3da5ef7a..d01d004a1d 100644 --- a/src/rabbit_direct.erl +++ b/src/rabbit_direct.erl @@ -80,17 +80,23 @@ connect({Username, Password}, VHost, Protocol, Pid, Infos) -> connect0(AuthFun, VHost, Protocol, Pid, Infos) -> case rabbit:is_running() of - true -> case AuthFun() of - {ok, User = #user{username = Username}} -> - notify_auth_result(Username, - user_authentication_success, []), - connect1(User, VHost, Protocol, Pid, Infos); - {refused, Username, Msg, Args} -> - notify_auth_result(Username, - user_authentication_failure, - [{error, rabbit_misc:format(Msg, Args)}]), - {error, {auth_failure, "Refused"}} - end; + true -> + case whereis(rabbit_direct_client_sup) of + undefined -> + {error, broker_is_booting}; + _ -> + case AuthFun() of + {ok, User = #user{username = Username}} -> + notify_auth_result(Username, + user_authentication_success, []), + connect1(User, VHost, Protocol, Pid, Infos); + {refused, Username, Msg, Args} -> + notify_auth_result(Username, + user_authentication_failure, + [{error, rabbit_misc:format(Msg, Args)}]), + {error, {auth_failure, "Refused"}} + end + end; false -> {error, broker_not_found_on_node} end. |