mod_saslauth: Make service_name configurable for CyrusSASL users.

[prosody.git] / util / timer.lua

diff --git a/util/timer.lua b/util/timer.lua
index 4c9a3ea978c3eb07cd36a2853afd4af6d49b6501..c52d9c68bb2ff81e2d093f9d55a0e6a3baa10f47 100644 (file)
--- a/util/timer.lua
+++ b/util/timer.lua
@@ -9,6 +9,7 @@
 
 local ns_addtimer = require "net.server".addtimer;
 local event = require "net.server".event;
+local event_base = require "net.server".event_base;
 
 local get_time = os.time;
 local t_insert = table.insert;
@@ -54,10 +55,10 @@ if not event then
 else
        local EVENT_LEAVE = (event.core and event.core.LEAVE) or -1;
        function _add_task(delay, func)
-               event.base:addevent(nil, event.EV_TIMEOUT, function ()
+               event_base:addevent(nil, 0, function ()
                        local ret = func();
                        if ret then
-                               _add_task(ret, func);
+                               return 0, ret;
                        else
                                return EVENT_LEAVE;
                        end