From: Mickaël Rémond <mickael.remond@process-one.net>
Date: Sun, 18 May 2008 12:28:58 +0000 (+0000)
Subject: * src/ejabberd_s2s_out.erl: Avoid an harmless error (function clause in logs)
X-Git-Tag: v2.1.0~18^2~707
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8a8a02431f3de1a879c4c496d72712c552f99eab;p=ejabberd

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

SVN Revision: 1331
---

diff --git a/ChangeLog b/ChangeLog
index 7b1cec7ea..d0d960d25 100644
--- 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 781591b64..2207a6d70 100644
--- 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(