* src/ejabberd_s2s_out.erl: Improve confusing log message in s2s

connection: wait_for_validation connect timeout (EJAB-617)

SVN Revision: 1311

diff --git a/ChangeLog b/ChangeLog
index c270f178dba39e81bcff0bc32ecad2f7362342ac..a556fe042255be358ec7739ef9064366476279d5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2008-04-29  Badlop  <badlop@process-one.net>
 
+       * src/ejabberd_s2s_out.erl: Improve confusing log message in s2s
+       connection: wait_for_validation connect timeout (EJAB-617)
+
        * src/ejabberd.cfg.example: Small improvements in explanations
 
        * doc/guide.tex: Document MUC room options (EJAB-619)

diff --git a/src/ejabberd_s2s_out.erl b/src/ejabberd_s2s_out.erl
index e5f8ed254d82dd3c02cf2e8f8f442c03ccf8c2ab..4271e43a6fec6596801c5f0d0ae000864afab7b7 100644 (file)
--- a/src/ejabberd_s2s_out.erl
+++ b/src/ejabberd_s2s_out.erl
@@ -375,6 +375,14 @@ wait_for_validation({xmlstreamerror, _}, StateData) ->
              ?INVALID_XML_ERR ++ ?STREAM_TRAILER),
     {stop, normal, StateData};
 
+wait_for_validation(timeout, #state{verify = {VPid, VKey, SID}} = StateData)
+  when is_pid(VPid) and is_list(VKey) and is_list(SID) ->
+    %% This is an auxiliary s2s connection for dialback.
+    %% This timeout is normal and doesn't represent a problem.
+    ?DEBUG("wait_for_validation: ~s -> ~s (timeout in verify connection)",
+          [StateData#state.myname, StateData#state.server]),
+    {stop, normal, StateData};
+
 wait_for_validation(timeout, StateData) ->
     ?INFO_MSG("wait_for_validation: ~s -> ~s (connect timeout)",
              [StateData#state.myname, StateData#state.server]),