]> granicus.if.org Git - ejabberd/commitdiff
Provide more detailed log message when s2s stream start fails.
authorBadlop <badlop@process-one.net>
Mon, 28 Dec 2009 15:29:42 +0000 (15:29 +0000)
committerBadlop <badlop@process-one.net>
Mon, 28 Dec 2009 15:29:42 +0000 (15:29 +0000)
SVN Revision: 2831

src/ejabberd_s2s_out.erl

index 97b94555f6a7f356abd0e5a971727488b8ed8612..ef12836cab2f2367b5f9d9b55473b5f81588d400 100644 (file)
@@ -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;