aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2009-12-02 20:35:31 +0000
committerMatthew Wild <mwild1@gmail.com>2009-12-02 20:35:31 +0000
commite6e7da8e0d18b47df439890229b6a61cff6ed8d4 (patch)
treeb938d3efe7a6b47a5d4febe71d8f67a5db1365f2
parent2370fec36d773894955fa6fbf738435856148538 (diff)
parente6d31cc15a87ef3725ef9064fbfabf0bfb1bcf73 (diff)
downloadprosody-e6e7da8e0d18b47df439890229b6a61cff6ed8d4.tar.gz
prosody-e6e7da8e0d18b47df439890229b6a61cff6ed8d4.zip
Merge with Tobias
-rw-r--r--plugins/mod_console.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/mod_console.lua b/plugins/mod_console.lua
index 9962b3f6..5e6b6846 100644
--- a/plugins/mod_console.lua
+++ b/plugins/mod_console.lua
@@ -478,7 +478,7 @@ function def_env.s2s:show(match_jid)
for remotehost, session in pairs(host_session.s2sout) do
if (not match_jid) or remotehost:match(match_jid) or host:match(match_jid) then
count_out = count_out + 1;
- print(" "..host.." -> "..remotehost..(session.secure and " (encrypted)" or ""));
+ print(" "..host.." -> "..remotehost..(session.secure and " (encrypted)" or "")..(session.compressed and " (compressed)" or ""));
if session.sendq then
print(" There are "..#session.sendq.." queued outgoing stanzas for this connection");
end
@@ -515,7 +515,7 @@ function def_env.s2s:show(match_jid)
-- Pft! is what I say to list comprehensions
or (session.hosts and #array.collect(keys(session.hosts)):filter(subhost_filter)>0)) then
count_in = count_in + 1;
- print(" "..host.." <- "..(session.from_host or "(unknown)")..(session.secure and " (encrypted)" or ""));
+ print(" "..host.." <- "..(session.from_host or "(unknown)")..(session.secure and " (encrypted)" or "")..(session.compressed and " (compressed)" or ""));
if session.type == "s2sin_unauthed" then
print(" Connection not yet authenticated");
end