diff options
| author | Matthew Wild <mwild1@gmail.com> | 2012-05-03 16:48:34 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2012-05-03 16:48:34 +0100 |
| commit | 3df4f1a43c2a4de52f4fe5b5cb2bcd5bfc104fd4 (patch) | |
| tree | 5fa30994b62edf97cf8d73c504e8bd6a74d1d3c4 /util | |
| parent | 30d1d9729c349fbbf9c1bf93afd0ad4aca32e233 (diff) | |
| download | prosody-3df4f1a43c2a4de52f4fe5b5cb2bcd5bfc104fd4.tar.gz prosody-3df4f1a43c2a4de52f4fe5b5cb2bcd5bfc104fd4.zip | |
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)
Diffstat (limited to 'util')
| -rw-r--r-- | util/timer.lua | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/util/timer.lua b/util/timer.lua index d36fb8c4..ba7dd429 100644 --- a/util/timer.lua +++ b/util/timer.lua @@ -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 () |