Chapril
/
xmpp.chapril.org-ejabberd
mirror of https://github.com/processone/ejabberd.git
24
1
Fork 0
Code Releases Activity

Report more TLS errors

This commit is contained in:
Evgeniy Khramtsov 2017-03-08 08:27:54 +03:00
parent bdc278399d
commit dd11ed82d7
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/ejabberd_c2s.erl
View File

@ -276,8 +276,7 @@ process_terminated(#{sockmod := SockMod, socket := Socket, jid := JID} = State,
bounce_message_queue(), bounce_message_queue(),
State1; State1;
process_terminated(#{sockmod := SockMod, socket := Socket, process_terminated(#{sockmod := SockMod, socket := Socket,
stop_reason := {tls, no_certfile}} = State, Reason) -> stop_reason := {tls, _}} = State, Reason) ->
%% TODO: we probably need to report more TLS errors here
?ERROR_MSG("(~s) Failed to secure c2s connection: ~s", ?ERROR_MSG("(~s) Failed to secure c2s connection: ~s",
[SockMod:pp(Socket), format_reason(State, Reason)]), [SockMod:pp(Socket), format_reason(State, Reason)]),
State; State;

3
src/ejabberd_s2s_in.erl
View File

@ -288,8 +288,7 @@ handle_info(Info, #{server_host := LServer} = State) ->
terminate(Reason, #{auth_domains := AuthDomains, terminate(Reason, #{auth_domains := AuthDomains,
sockmod := SockMod, socket := Socket} = State) -> sockmod := SockMod, socket := Socket} = State) ->
case maps:get(stop_reason, State, undefined) of case maps:get(stop_reason, State, undefined) of
{tls, no_certfile} = Err -> {tls, _} = Err ->
%% TODO: we probably need to report more TLS errors here
?ERROR_MSG("(~s) Failed to secure inbound s2s connection: ~s", ?ERROR_MSG("(~s) Failed to secure inbound s2s connection: ~s",
[SockMod:pp(Socket), xmpp_stream_in:format_error(Err)]); [SockMod:pp(Socket), xmpp_stream_in:format_error(Err)]);
_ -> _ ->