* src/ejabberd_s2s_out.erl: Avoid an harmless error (function clause in logs)

SVN Revision: 1331

diff --git a/ChangeLog b/ChangeLog
index 7b1cec7ea1f14f1e2f3e26f98751c7db375cfdbf..d0d960d25ec4fd86176f9baf3870f5cdadb38b74 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-19  Mickael Remond  <mremond@process-one.net>
+
+       * src/ejabberd_s2s_out.erl: Avoid an harmless error (function clause in
+       logs) 
+
 2008-05-17  Badlop  <badlop@process-one.net>
 
        * src/extauth.erl: Log strange responses from extauth script. Use

diff --git a/src/ejabberd_s2s_out.erl b/src/ejabberd_s2s_out.erl
index 781591b648405d1685a767366168419b3b7454ba..2207a6d702a2f05075d84292004a7d0a8c4fd80e 100644 (file)
--- a/src/ejabberd_s2s_out.erl
+++ b/src/ejabberd_s2s_out.erl
@@ -297,6 +297,11 @@ wait_for_stream({xmlstreamerror, _}, StateData) ->
              [StateData#state.myname, StateData#state.server]),
     {stop, normal, StateData};
 
+wait_for_stream({xmlstreamend,_Name}, StateData) ->
+    ?INFO_MSG("Closing s2s connection: ~s -> ~s (xmlstreamend)",
+             [StateData#state.myname, StateData#state.server]),
+    {stop, normal, StateData};
+
 wait_for_stream(timeout, StateData) ->
     ?INFO_MSG("Closing s2s connection: ~s -> ~s (timeout in wait_for_stream)",
              [StateData#state.myname, StateData#state.server]),
@@ -680,7 +685,7 @@ stream_established({xmlstreamelement, El}, StateData) ->
     {next_state, stream_established, StateData};
 
 stream_established({xmlstreamend, _Name}, StateData) ->
-    ?INFO_MSG("stream established: ~s -> ~s (xmlstreamend)",
+    ?INFO_MSG("Connection closed in stream established: ~s -> ~s (xmlstreamend)",
              [StateData#state.myname, StateData#state.server]),
     {stop, normal, StateData};
 
@@ -969,7 +974,7 @@ get_addr_port(Server) ->
                                              end,
                                          {Priority * 65536 - N, Host, Port}
                                  end, AddrList)) of
-                       {'EXIT', _Reasn} ->
+                       {'EXIT', _Reason} ->
                            [{Server, outgoing_s2s_port()}];
                        SortedList ->
                            List = lists:map(