aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mod_s2s/mod_s2s.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-01-26 19:47:33 +0100
committerKim Alvefur <zash@zash.se>2017-01-26 19:47:33 +0100
commit4c6a84a00ef37846e432ba76e3771087d23cceb1 (patch)
treed70f10039b1ee0bdec5f010014db2fd1fe0b7b83 /plugins/mod_s2s/mod_s2s.lua
parent0c22ed35793dc8b751dea8c89e418986efd8aa08 (diff)
parenta67d0bfb97f2c2e0b2cd7a303accd70c95911275 (diff)
downloadprosody-4c6a84a00ef37846e432ba76e3771087d23cceb1.tar.gz
prosody-4c6a84a00ef37846e432ba76e3771087d23cceb1.zip
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_s2s/mod_s2s.lua')
-rw-r--r--plugins/mod_s2s/mod_s2s.lua6
1 files changed, 2 insertions, 4 deletions
diff --git a/plugins/mod_s2s/mod_s2s.lua b/plugins/mod_s2s/mod_s2s.lua
index 00e816f7..c2dd9900 100644
--- a/plugins/mod_s2s/mod_s2s.lua
+++ b/plugins/mod_s2s/mod_s2s.lua
@@ -47,8 +47,6 @@ local runner_callbacks = {};
local log = module._log;
module:hook("stats-update", function ()
- -- Connection counter resets to 0 on load and reload
- -- Bump it up to current value
local count = 0;
for _ in pairs(sessions) do
count = count + 1;
@@ -382,8 +380,8 @@ function stream_callbacks._streamopened(session, attr)
log("debug", "Sending stream features: %s", tostring(features));
session.sends2s(features);
else
- (session.log or log)("warn", "No features to offer, giving up");
- session:close({ condition = "undefined-condition", text = "No features to offer" });
+ (session.log or log)("warn", "No stream features to offer, giving up");
+ session:close({ condition = "undefined-condition", text = "No stream features to offer" });
end
end
elseif session.direction == "outgoing" then