Merge 0.10->trunk

[prosody.git] / util / watchdog.lua

diff --git a/util/watchdog.lua b/util/watchdog.lua
index bcb2e274dd609935b9613b4c63dbc7db352ea980..aa8c6486781a51de97f96b4a9c7bf7fd4018b0f0 100644 (file)
--- a/util/watchdog.lua
+++ b/util/watchdog.lua
@@ -2,12 +2,12 @@ local timer = require "util.timer";
 local setmetatable = setmetatable;
 local os_time = os.time;
 
-module "watchdog"
+local _ENV = nil;
 
 local watchdog_methods = {};
 local watchdog_mt = { __index = watchdog_methods };
 
-function new(timeout, callback)
+local function new(timeout, callback)
        local watchdog = setmetatable({ timeout = timeout, last_reset = os_time(), callback = callback }, watchdog_mt);
        timer.add_task(timeout+1, function (current_time)
                local last_reset = watchdog.last_reset;
@@ -31,4 +31,6 @@ function watchdog_methods:cancel()
        self.last_reset = nil;
 end
 
-return _M;
+return {
+       new = new;
+};