Diff

plugins/mod_s2s/mod_s2s.lua @ 7868:11fcdef5022f

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Thu, 26 Jan 2017 19:47:33 +0100
parent 7686:8d6f367bed8c
parent 7866:b6d99132d7dc
child 8235:7d9a2c200736
line wrap: on
line diff
--- a/plugins/mod_s2s/mod_s2s.lua	Tue Jan 24 21:24:03 2017 +0100
+++ b/plugins/mod_s2s/mod_s2s.lua	Thu Jan 26 19:47:33 2017 +0100
@@ -47,8 +47,6 @@
 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 @@
 				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