24
1
mirror of https://github.com/processone/ejabberd.git synced 2024-06-16 22:05:29 +02:00

Provide more detailed log message when s2s stream start fails.

SVN Revision: 2831
This commit is contained in:
Badlop 2009-12-28 15:29:42 +00:00
parent 9aa9c34a57
commit d812975565

View File

@ -297,11 +297,12 @@ wait_for_stream({xmlstreamstart, _Name, Attrs}, StateData) ->
{next_state, wait_for_features, StateData, ?FSMTIMEOUT}; {next_state, wait_for_features, StateData, ?FSMTIMEOUT};
{"jabber:server", "", true} when StateData#state.use_v10 -> {"jabber:server", "", true} when StateData#state.use_v10 ->
{next_state, wait_for_features, StateData#state{db_enabled = false}, ?FSMTIMEOUT}; {next_state, wait_for_features, StateData#state{db_enabled = false}, ?FSMTIMEOUT};
{NSProvided, _, _} -> {NSProvided, DB, _} ->
send_text(StateData, ?INVALID_NAMESPACE_ERR), send_text(StateData, ?INVALID_NAMESPACE_ERR),
?INFO_MSG("Closing s2s connection: ~s -> ~s (invalid namespace).~n" ?INFO_MSG("Closing s2s connection: ~s -> ~s (invalid namespace).~n"
"Namespace provided: ~p~nNamespace expected: \"jabber:server\"", "Namespace provided: ~p~nNamespace expected: \"jabber:server\"~n"
[StateData#state.myname, StateData#state.server, NSProvided]), "xmlns:db provided: ~p~nAll attributes: ~p",
[StateData#state.myname, StateData#state.server, NSProvided, DB, Attrs]),
{stop, normal, StateData} {stop, normal, StateData}
end; end;