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 | c160b029b0eeff8c57d8ddcde8a5f7c424074631 (patch) | |
| tree | ebce784d8a5d08c50eb50fb1ab530afa46dd1782 /util | |
| parent | 29b64a45009858091f41e6443561299cac3416b8 (diff) | |
| parent | 83d1e9570a93cbea53e0420ada95e7273695fe78 (diff) | |
| download | prosody-c160b029b0eeff8c57d8ddcde8a5f7c424074631.tar.gz prosody-c160b029b0eeff8c57d8ddcde8a5f7c424074631.zip | |
Merge 0.10->trunk
Diffstat (limited to 'util')
| -rw-r--r-- | util/statistics.lua | 2 | ||||
| -rw-r--r-- | util/statsd.lua | 2 | ||||
| -rw-r--r-- | util/throttle.lua | 2 | ||||
| -rw-r--r-- | util/timer.lua | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/util/statistics.lua b/util/statistics.lua index 26355026..39954652 100644 --- a/util/statistics.lua +++ b/util/statistics.lua @@ -1,6 +1,6 @@ local t_sort = table.sort local m_floor = math.floor; -local time = require "socket".gettime; +local time = require "util.time".now; local function nop_function() end diff --git a/util/statsd.lua b/util/statsd.lua index e5322de9..67481c36 100644 --- a/util/statsd.lua +++ b/util/statsd.lua @@ -1,6 +1,6 @@ local socket = require "socket"; -local time = require "socket".gettime; +local time = require "util.time".now local function new(config) if not config or not config.statsd_server then diff --git a/util/throttle.lua b/util/throttle.lua index 3d3f5d2d..18692a8a 100644 --- a/util/throttle.lua +++ b/util/throttle.lua @@ -1,5 +1,5 @@ -local gettime = require "socket".gettime; +local gettime = require "util.time".now local setmetatable = setmetatable; local floor = math.floor; 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; |