25
1
mirror of https://github.com/processone/ejabberd.git synced 2024-12-22 17:28:25 +01:00

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

SVN Revision: 814
This commit is contained in:
Mickaël Rémond 2007-07-17 07:20:55 +00:00
parent 745be8373f
commit 1b19d72e6f
2 changed files with 8 additions and 2 deletions

View File

@ -1,5 +1,8 @@
2007-07-17 Mickael Remond <mickael.remond@process-one.net> 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 * src/odbc/ejabberd_odbc.erl: Better error handling for MySQL
native driver (EJAB-224). native driver (EJAB-224).

View File

@ -101,7 +101,6 @@ start_connection(Pid) ->
%% {stop, StopReason} %% {stop, StopReason}
%%---------------------------------------------------------------------- %%----------------------------------------------------------------------
init([From, Server, Type]) -> init([From, Server, Type]) ->
?INFO_MSG("started: ~p", [{From, Server, Type}]),
TLS = case ejabberd_config:get_local_option(s2s_use_starttls) of TLS = case ejabberd_config:get_local_option(s2s_use_starttls) of
undefined -> undefined ->
false; false;
@ -140,6 +139,10 @@ init([From, Server, Type]) ->
%% {stop, Reason, NewStateData} %% {stop, Reason, NewStateData}
%%---------------------------------------------------------------------- %%----------------------------------------------------------------------
open_socket(init, StateData) -> 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 AddrList = case idna:domain_utf8_to_ascii(StateData#state.server) of
false -> []; false -> [];
ASCIIAddr -> ASCIIAddr ->
@ -651,7 +654,7 @@ handle_info(_, StateName, StateData) ->
%% Returns: any %% Returns: any
%%---------------------------------------------------------------------- %%----------------------------------------------------------------------
terminate(Reason, StateName, StateData) -> terminate(Reason, StateName, StateData) ->
?INFO_MSG("terminated: ~p", [Reason]), ?INFO_MSG("terminated: ~p", [{Reason, StateName}]),
case StateData#state.new of case StateData#state.new of
false -> false ->
ok; ok;