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 | 669449342ff7f72b94149861c8dbf156d0343e1a (patch) | |
| tree | 4c56350b49c07b9ab63a705fc167339ef54dca96 /core/moduleapi.lua | |
| parent | e6fa5c423772e1c379abaeff6f35ba2e1e5153af (diff) | |
| parent | be752a7c9ef957cc05b83941ff5be1971312b171 (diff) | |
| download | prosody-669449342ff7f72b94149861c8dbf156d0343e1a.tar.gz prosody-669449342ff7f72b94149861c8dbf156d0343e1a.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); |