diff options
| author | Kim Alvefur <zash@zash.se> | 2013-08-14 15:00:36 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2013-08-14 15:00:36 +0200 |
| commit | 938d568ac476bb73e83b8ee44ba61c23f29557a8 (patch) | |
| tree | d57ee9d481b5590fabb816378ec9e5838fd616a8 | |
| parent | 1764b9fba374409db402ab96190c9b4cd5db112b (diff) | |
| download | prosody-938d568ac476bb73e83b8ee44ba61c23f29557a8.tar.gz prosody-938d568ac476bb73e83b8ee44ba61c23f29557a8.zip | |
mod_c2s, mod_s2s: Log cipher and encryption info in a more compact and (hopefully) less confusing way
| -rw-r--r-- | plugins/mod_c2s.lua | 3 | ||||
| -rw-r--r-- | plugins/mod_s2s/mod_s2s.lua | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/plugins/mod_c2s.lua b/plugins/mod_c2s.lua index 8a652a33..1cf4b98d 100644 --- a/plugins/mod_c2s.lua +++ b/plugins/mod_c2s.lua @@ -73,8 +73,7 @@ function stream_callbacks.streamopened(session, attr) local sock = session.conn:socket(); if sock.info then local info = sock:info(); - (session.log or log)("info", "Stream encrypted (%s) with %s, authenticated with %s and exchanged keys with %s", - info.protocol, info.encryption, info.authentication, info.key); + (session.log or log)("info", "Stream encrypted (%s with %s)", info.protocol, info.cipher); session.compressed = info.compression; else (session.log or log)("info", "Stream encrypted"); diff --git a/plugins/mod_s2s/mod_s2s.lua b/plugins/mod_s2s/mod_s2s.lua index 331e99f1..1d03f3e4 100644 --- a/plugins/mod_s2s/mod_s2s.lua +++ b/plugins/mod_s2s/mod_s2s.lua @@ -287,8 +287,7 @@ function stream_callbacks.streamopened(session, attr) local sock = session.conn:socket(); if sock.info then local info = sock:info(); - (session.log or log)("info", "Stream encrypted (%s) with %s, authenticated with %s and exchanged keys with %s", - info.protocol, info.encryption, info.authentication, info.key); + (session.log or log)("info", "Stream encrypted (%s with %s)", info.protocol, info.cipher); session.compressed = info.compression; else (session.log or log)("info", "Stream encrypted"); |