* src/ejabberd_s2s_out.erl: Improved place of the INFO / DEBUG printout (EJAB-282).

SVN Revision: 814

2 files changed, 8 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 4d20177c6..3c9747f77 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2007-07-17  Mickael Remond  <mickael.remond@process-one.net>
 
+	* src/ejabberd_s2s_out.erl: Improved place of the INFO /
+	DEBUG printout.
+
 	* src/odbc/ejabberd_odbc.erl: Better error handling for MySQL
 	native driver (EJAB-224).
 
diff --git a/src/ejabberd_s2s_out.erl b/src/ejabberd_s2s_out.erl
index e587bbf34..62a952e99 100644
--- a/src/ejabberd_s2s_out.erl
+++ b/src/ejabberd_s2s_out.erl
@@ -101,7 +101,6 @@ start_connection(Pid) ->
 %%          {stop, StopReason}                   
 %%----------------------------------------------------------------------
 init([From, Server, Type]) ->
-    ?INFO_MSG("started: ~p", [{From, Server, Type}]),
     TLS = case ejabberd_config:get_local_option(s2s_use_starttls) of
 	      undefined ->
 		  false;
@@ -140,6 +139,10 @@ init([From, Server, Type]) ->
 %%          {stop, Reason, NewStateData}                         
 %%----------------------------------------------------------------------
 open_socket(init, StateData) ->
+    ?INFO_MSG("open_socket: ~p", [{StateData#state.myname,
+                                   StateData#state.server,
+				   StateData#state.new,
+				   StateData#state.verify}]),
     AddrList = case idna:domain_utf8_to_ascii(StateData#state.server) of
 		   false -> [];
 		   ASCIIAddr ->
@@ -651,7 +654,7 @@ handle_info(_, StateName, StateData) ->
 %% Returns: any
 %%----------------------------------------------------------------------
 terminate(Reason, StateName, StateData) ->
-    ?INFO_MSG("terminated: ~p", [Reason]),
+    ?INFO_MSG("terminated: ~p", [{Reason, StateName}]),
     case StateData#state.new of
 	false ->
 	    ok;