prosody
e9d7a409e236
core/moduleapi.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Diff

core/moduleapi.lua @ 7647:e9d7a409e236

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Wed, 31 Aug 2016 16:25:21 +0100
parent 7343:1da5a710848d
parent 7646:6210dfaec84f
child 7950:f91e7ec9654e
line wrap: on
line diff
--- a/core/moduleapi.lua	Tue Aug 30 17:54:24 2016 +0200
+++ b/core/moduleapi.lua	Wed Aug 31 16:25:21 2016 +0100
@@ -431,7 +431,7 @@
 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);