Software / code / prosody
Diff
util/timer.lua @ 7989:5632aa85e0b6
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Mon, 20 Mar 2017 03:11:27 +0100 |
| parent | 7015:17e275e8bd79 |
| parent | 7988:dc758422d896 |
| child | 8555:4f0f5b49bb03 |
line wrap: on
line diff
--- a/util/timer.lua Fri Mar 17 23:14:03 2017 +0100 +++ b/util/timer.lua Mon Mar 20 03:11:27 2017 +0100 @@ -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;
