aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBadlop <badlop@process-one.net>2009-12-28 15:29:42 +0000
committerBadlop <badlop@process-one.net>2009-12-28 15:29:42 +0000
commitd812975565891230f5fff79207ccd95bcc4def3b (patch)
treec4e29d55c94aeb2c53c1c843a112c4f025b9209a /src
parentBetter use install_fallback when importing a Mnesia backup file. (diff)
Provide more detailed log message when s2s stream start fails.
SVN Revision: 2831
Diffstat (limited to 'src')
-rw-r--r--src/ejabberd_s2s_out.erl7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/ejabberd_s2s_out.erl b/src/ejabberd_s2s_out.erl
index 97b94555f..ef12836ca 100644
--- a/src/ejabberd_s2s_out.erl
+++ b/src/ejabberd_s2s_out.erl
@@ -297,11 +297,12 @@ wait_for_stream({xmlstreamstart, _Name, Attrs}, StateData) ->
{next_state, wait_for_features, StateData, ?FSMTIMEOUT};
{"jabber:server", "", true} when StateData#state.use_v10 ->
{next_state, wait_for_features, StateData#state{db_enabled = false}, ?FSMTIMEOUT};
- {NSProvided, _, _} ->
+ {NSProvided, DB, _} ->
send_text(StateData, ?INVALID_NAMESPACE_ERR),
?INFO_MSG("Closing s2s connection: ~s -> ~s (invalid namespace).~n"
- "Namespace provided: ~p~nNamespace expected: \"jabber:server\"",
- [StateData#state.myname, StateData#state.server, NSProvided]),
+ "Namespace provided: ~p~nNamespace expected: \"jabber:server\"~n"
+ "xmlns:db provided: ~p~nAll attributes: ~p",
+ [StateData#state.myname, StateData#state.server, NSProvided, DB, Attrs]),
{stop, normal, StateData}
end;