diff options
author | Matthew Wild <mwild1@gmail.com> | 2016-08-31 16:25:21 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2016-08-31 16:25:21 +0100 |
commit | 37913e5ce81c5e0b404aa2389102e0a30b00c111 (patch) | |
tree | 4c56350b49c07b9ab63a705fc167339ef54dca96 /core/moduleapi.lua | |
parent | f25bb95b8680adffa070c07fa762bde6af383957 (diff) | |
parent | e2dbea53b4aa078633e6270da25a633741d4ae23 (diff) | |
download | prosody-37913e5ce81c5e0b404aa2389102e0a30b00c111.tar.gz prosody-37913e5ce81c5e0b404aa2389102e0a30b00c111.zip |
Merge 0.10->trunk
Diffstat (limited to 'core/moduleapi.lua')
-rw-r--r-- | core/moduleapi.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/moduleapi.lua b/core/moduleapi.lua index 9b773f89..d89d46fa 100644 --- a/core/moduleapi.lua +++ b/core/moduleapi.lua @@ -431,7 +431,7 @@ function api:measure(name, stat_type) end function api:measure_object_event(events_object, event_name, stat_name) - local m = self:measure(stat_name or event_name, "duration"); + local m = self:measure(stat_name or event_name, "times"); local function handler(handlers, _event_name, _event_data) local finished = m(); local ret = handlers(_event_name, _event_data); |