25
1
mirror of https://github.com/processone/ejabberd.git synced 2024-11-30 16:36:29 +01:00

Provide more detailed log message when s2s stream start fails.

SVN Revision: 2832
This commit is contained in:
Badlop 2009-12-28 15:31:18 +00:00
parent 378a6b2ff2
commit 381dff1afc

View File

@ -289,12 +289,12 @@ wait_for_stream({xmlstreamstart, Opening}, StateData) ->
{next_state, wait_for_features, StateData, ?FSMTIMEOUT}; {next_state, wait_for_features, StateData, ?FSMTIMEOUT};
{?NS_JABBER_SERVER, false, true} when StateData#state.use_v10 -> {?NS_JABBER_SERVER, false, 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_element(StateData, exmpp_stream:error('invalid-namespace')), send_element(StateData, exmpp_stream:error('invalid-namespace')),
?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: ~p", "Namespace provided: ~p~nNamespace expected: \"jabber:server\"~n"
[StateData#state.myname, StateData#state.server, "xmlns:db provided: ~p~nAll attributes: ~p",
NSProvided, ?NS_JABBER_SERVER]), [StateData#state.myname, StateData#state.server, NSProvided, DB, Attrs]),
{stop, normal, StateData} {stop, normal, StateData}
end; end;