diff options
| author | Matthew Wild <mwild1@gmail.com> | 2015-05-06 19:21:29 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2015-05-06 19:21:29 +0100 |
| commit | a540d613cd08b8feee096d19b727d1f5b2cab507 (patch) | |
| tree | ac1899833b30b87ea97439f061e9b892bd188367 /util | |
| parent | 8b320cb39f3d22c7af46d33ddfc017a726db30d0 (diff) | |
| parent | 80bafb72003774e5eb63ef9d3d7960385cfb8c6a (diff) | |
| download | prosody-a540d613cd08b8feee096d19b727d1f5b2cab507.tar.gz prosody-a540d613cd08b8feee096d19b727d1f5b2cab507.zip | |
Merge
Diffstat (limited to 'util')
| -rw-r--r-- | util/datamanager.lua | 2 | ||||
| -rw-r--r-- | util/events.lua | 3 | ||||
| -rw-r--r-- | util/statistics.lua | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/util/datamanager.lua b/util/datamanager.lua index b82349f1..b4138638 100644 --- a/util/datamanager.lua +++ b/util/datamanager.lua @@ -293,7 +293,7 @@ function users(host, store, typ) local mode, err = lfs.attributes(store_dir, "mode"); if not mode then - return function() log("debug", err or (store_dir .. " does not exist")) end + return function() log("debug", "%s", err or (store_dir .. " does not exist")) end end local next, state = lfs.dir(store_dir); return function(state) diff --git a/util/events.lua b/util/events.lua index e93d6204..d19da98b 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; @@ -121,7 +122,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 |