diff options
| author | Kim Alvefur <zash@zash.se> | 2015-05-05 01:34:20 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2015-05-05 01:34:20 +0200 |
| commit | ba96c2f7db5ce079d7609dff90591b9872ba6143 (patch) | |
| tree | 0d7008e74a3ae1c6dd45d705691566a9a685d2f7 | |
| parent | 009cde88a5518e95481126c547bf0b79f95ac797 (diff) | |
| parent | 9699e09082cb84af5e2c74c05d162438a4c6d536 (diff) | |
| download | prosody-ba96c2f7db5ce079d7609dff90591b9872ba6143.tar.gz prosody-ba96c2f7db5ce079d7609dff90591b9872ba6143.zip | |
Merge 0.10->trunk
| -rw-r--r-- | util/events.lua | 3 | ||||
| -rw-r--r-- | util/statistics.lua | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/util/events.lua b/util/events.lua index 79de1151..81fbc13f 100644 --- a/util/events.lua +++ b/util/events.lua @@ -9,6 +9,7 @@ local pairs = pairs; local t_insert = table.insert; +local t_remove = table.remove; local t_sort = table.sort; local setmetatable = setmetatable; local next = next; @@ -118,7 +119,7 @@ function new() if not w then return; end for i = #w, 1 do if w[i] == wrapper then - table.remove(w, i); + t_remove(w, i); end end if #w == 0 then diff --git a/util/statistics.lua b/util/statistics.lua index a05a1f91..26355026 100644 --- a/util/statistics.lua +++ b/util/statistics.lua @@ -88,7 +88,7 @@ local function new_registry(config) return function (value) n_actual_events = n_actual_events + 1; - if n_actual_events%duration_sample_interval > 0 then + if n_actual_events%duration_sample_interval == 1 then last_event = (last_event%duration_max_samples) + 1; events[last_event] = value; end @@ -113,7 +113,7 @@ local function new_registry(config) return function () n_actual_events = n_actual_events + 1; - if n_actual_events%duration_sample_interval > 0 then + if n_actual_events%duration_sample_interval ~= 1 then return nop_function; end |