mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

net.server, net.timer, net.server_select: Rearrange dependencies between these three modules. server.addtimer() is no longer a public function (renamed to _addtimer) and is not available at all from server_event (compat code removed to prevent traceback) (thanks Nulani)

Browse source
This commit is contained in:
Matthew Wild 2012-05-03 16:48:34 +01:00
parent 3d3ad31191
commit ffa939698b
3 changed files with 9 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

13
util/timer.lua
View file

@ -6,11 +6,7 @@
-- COPYING file in the source package for more information.
--
local ns_addtimer = require "net.server".addtimer;
local event = require "net.server".event;
local event_base = require "net.server".event_base;
local server = require "net.server";
local math_min = math.min
local math_huge = math.huge
local get_time = require "socket".gettime;
@ -24,7 +20,7 @@ local new_data = {};
module "timer"
local _add_task;
if not event then
if not server.event then
function _add_task(delay, callback)
local current_time = get_time();
delay = delay + current_time;
@ -38,7 +34,7 @@ if not event then
end
end
ns_addtimer(function()
server._addtimer(function()
local current_time = get_time();
if #new_data > 0 then
for _, d in pairs(new_data) do
@ -64,7 +60,10 @@ if not event then
return next_time;
end);
else
local event = require "net.server".event;
local event_base = require "net.server".event_base;
local EVENT_LEAVE = (event.core and event.core.LEAVE) or -1;
function _add_task(delay, callback)
local event_handle;
event_handle = event_base:addevent(nil, 0, function ()