diff options
| author | Kim Alvefur <zash@zash.se> | 2017-03-20 03:11:27 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2017-03-20 03:11:27 +0100 |
| commit | 5b7128c9f1272e67e248355c1fb0d23890ac7081 (patch) | |
| tree | ebce784d8a5d08c50eb50fb1ab530afa46dd1782 /util/timer.lua | |
| parent | 3b4130d49016ad983fdcf53931190d0ccdc176c2 (diff) | |
| parent | 2200724140d472766c3e78bab761f9cbce97b020 (diff) | |
| download | prosody-5b7128c9f1272e67e248355c1fb0d23890ac7081.tar.gz prosody-5b7128c9f1272e67e248355c1fb0d23890ac7081.zip | |
Merge 0.10->trunk
Diffstat (limited to 'util/timer.lua')
| -rw-r--r-- | util/timer.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/util/timer.lua b/util/timer.lua index 2277ee77..c7996bfa 100644 --- a/util/timer.lua +++ b/util/timer.lua @@ -9,7 +9,7 @@ local indexedbheap = require "util.indexedbheap"; local log = require "util.logger".init("timer"); local server = require "net.server"; -local get_time = require "socket".gettime; +local get_time = require "util.time".now local type = type; local debug_traceback = debug.traceback; local tostring = tostring; |