Diff

plugins/mod_s2s/mod_s2s.lua @ 6633:832987170da8

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 26 Apr 2015 00:07:36 +0200
parent 6626:071611bc4f1d
parent 6630:6735e2d735d6
child 6666:42fdc8dddf04
line wrap: on
line diff
--- a/plugins/mod_s2s/mod_s2s.lua	Sun Apr 05 16:47:49 2015 +0200
+++ b/plugins/mod_s2s/mod_s2s.lua	Sun Apr 26 00:07:36 2015 +0200
@@ -37,6 +37,8 @@
 	module:get_option_set("s2s_secure_domains", {})._items, module:get_option_set("s2s_insecure_domains", {})._items;
 local require_encryption = module:get_option_boolean("s2s_require_encryption", false);
 
+local measure_connections = module:measure("connections", "counter");
+
 local sessions = module:shared("sessions");
 
 local log = module._log;
@@ -577,6 +579,7 @@
 end
 
 function listener.onconnect(conn)
+	measure_connections(1);
 	conn:setoption("keepalive", opt_keepalives);
 	local session = sessions[conn];
 	if not session then -- New incoming connection
@@ -608,6 +611,7 @@
 end
 
 function listener.ondisconnect(conn, err)
+	measure_connections(-1);
 	local session = sessions[conn];
 	if session then
 		sessions[conn] = nil;