diff options
| author | Badlop <badlop@process-one.net> | 2010-07-23 00:25:43 +0200 |
|---|---|---|
| committer | Badlop <badlop@process-one.net> | 2010-07-23 00:25:43 +0200 |
| commit | c8033833f98407a96d853b3df683b19ea1101a36 (patch) | |
| tree | 692c3f9a02ae60fb3cb63cccff47b90d9413deff /src | |
| parent | The command Update now returns meaningful message and exit-status (EJAB-1237) (diff) | |
When logging s2s out connection attempt or success, log if TLS is used
Diffstat (limited to 'src')
| -rw-r--r-- | src/ejabberd_s2s_out.erl | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/ejabberd_s2s_out.erl b/src/ejabberd_s2s_out.erl index 01ab8d8aa..a1c641280 100644 --- a/src/ejabberd_s2s_out.erl +++ b/src/ejabberd_s2s_out.erl @@ -192,7 +192,8 @@ init([From, Server, Type]) -> open_socket(init, StateData) -> log_s2s_out(StateData#state.new, StateData#state.myname, - StateData#state.server), + StateData#state.server, + StateData#state.tls), ?DEBUG("open_socket: ~p", [{StateData#state.myname, StateData#state.server, StateData#state.new, @@ -340,8 +341,8 @@ wait_for_validation({xmlstreamelement, El}, StateData) -> case Type of "valid" -> send_queue(StateData, StateData#state.queue), - ?INFO_MSG("Connection established: ~s -> ~s", - [StateData#state.myname, StateData#state.server]), + ?INFO_MSG("Connection established: ~s -> ~s with TLS=~p", + [StateData#state.myname, StateData#state.server, StateData#state.tls_enabled]), ejabberd_hooks:run(s2s_connect_hook, [StateData#state.myname, StateData#state.server]), @@ -1151,10 +1152,10 @@ outgoing_s2s_timeout() -> %% Human readable S2S logging: Log only new outgoing connections as INFO %% Do not log dialback -log_s2s_out(false, _, _) -> ok; +log_s2s_out(false, _, _, _) -> ok; %% Log new outgoing connections: -log_s2s_out(_, Myname, Server) -> - ?INFO_MSG("Trying to open s2s connection: ~s -> ~s",[Myname, Server]). +log_s2s_out(_, Myname, Server, Tls) -> + ?INFO_MSG("Trying to open s2s connection: ~s -> ~s with TLS=~p", [Myname, Server, Tls]). %% Calculate timeout depending on which state we are in: %% Can return integer > 0 | infinity |