From ad58924b057a520b9aa9f4f49ae019bc083f7c41 Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Thu, 2 Dec 2010 22:47:29 +0500 Subject: mod_bosh: Use util.timer for timers instead of server.addtimer. --- plugins/mod_bosh.lua | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/mod_bosh.lua b/plugins/mod_bosh.lua index 9546e653..2ea8e0a0 100644 --- a/plugins/mod_bosh.lua +++ b/plugins/mod_bosh.lua @@ -11,7 +11,6 @@ module.host = "*" -- Global module 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 core_process_stanza = core_process_stanza; 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 @@ function on_timer() 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(); -- cgit v1.2.3