Merge 0.9->0.10

[prosody.git] / core / moduleapi.lua

diff --git a/core/moduleapi.lua b/core/moduleapi.lua
index 887ba858b33fe6b7fa935e1be7d3fb1623404517..e32c116aa7fe57d694df7a79b86d9c0251bfb887 100644 (file)
--- a/core/moduleapi.lua
+++ b/core/moduleapi.lua
@@ -7,13 +7,14 @@
 --
 
 local config = require "core.configmanager";
-local modulemanager = require "modulemanager"; -- This is necessary to avoid require loops
+local modulemanager; -- This gets set from modulemanager
 local array = require "util.array";
 local set = require "util.set";
 local logger = require "util.logger";
 local pluginloader = require "util.pluginloader";
 local timer = require "util.timer";
 local resolve_relative_path = require"util.paths".resolve_relative_path;
+local measure = require "core.statsmanager".measure;
 
 local t_insert, t_remove, t_concat = table.insert, table.remove, table.concat;
 local error, setmetatable, type = error, setmetatable, type;
@@ -370,4 +371,13 @@ function api:open_store(name, type)
        return require"core.storagemanager".open(self.host, name or self.name, type);
 end
 
+function api:measure(name, type)
+       return measure(type, "/"..self.host.."/mod_"..self.name.."/"..name);
+end
+
+function api.init(mm)
+       modulemanager = mm;
+       return api;
+end
+
 return api;