mod_bosh: Use util.timer for timers instead of server.addtimer.

Thu, 02 Dec 2010 22:47:29 +0500

author
Waqas Hussain <waqas20@gmail.com>
date
Thu, 02 Dec 2010 22:47:29 +0500
changeset 3684
bd071e3901dc
parent 3683
c2158221e2e6
child 3685
63efe4eefa07

mod_bosh: Use util.timer for timers instead of server.addtimer.

plugins/mod_bosh.lua file | annotate | diff | comparison | revisions
--- a/plugins/mod_bosh.lua	Thu Dec 02 22:41:26 2010 +0500
+++ b/plugins/mod_bosh.lua	Thu Dec 02 22:47:29 2010 +0500
@@ -11,7 +11,6 @@
 local hosts = _G.hosts;
 local lxp = require "lxp";
 local init_xmlhandlers = require "core.xmlhandlers"
-local server = require "net.server";
 local httpserver = require "net.httpserver";
 local sm = require "core.sessionmanager";
 local sm_destroy_session = sm.destroy_session;
@@ -21,6 +20,7 @@
 local st = require "util.stanza";
 local logger = require "util.logger";
 local log = logger.init("mod_bosh");
+local timer = require "util.timer";
 
 local xmlns_streams = "http://etherx.jabber.org/streams";
 local xmlns_xmpp_streams = "urn:ietf:params:xml:ns:xmpp-streams";
@@ -401,13 +401,14 @@
 		dead_sessions[i] = nil;
 		sm_destroy_session(session, "BOSH client silent for over "..session.bosh_max_inactive.." seconds");
 	end
+	return 1;
 end
 
 
 local function setup()
 	local ports = module:get_option("bosh_ports") or { 5280 };
 	httpserver.new_from_config(ports, handle_request, { base = "http-bind" });
-	server.addtimer(on_timer);
+	timer.add_task(1, on_timer);
 end
 if prosody.start_time then -- already started
 	setup();

mercurial