mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 05:37:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

statsmanager: Add 'stats_provider' option, to allow selecting alternative API providers to util.statistics

Browse source
This commit is contained in:
Matthew Wild 2016-07-27 14:04:36 +01:00
parent 5a7fc4ca74
commit 0f8377e56a
1 changed files with 65 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

92
core/statsmanager.lua
View file

@ -1,5 +1,4 @@
local stats = require "util.statistics".new();
local config = require "core.configmanager";
local log = require "util.logger".init("stats");
local timer = require "util.timer";
@ -11,46 +10,86 @@ if stats_config and not stats_interval then
log("error", "Invalid 'statistics_interval' setting, statistics will be disabled");
end
local stats_provider_config = config.get("*", "statistics_provider");
local stats_provider = stats_provider_config or "internal";
local builtin_providers = {
internal = "util.statistics";
};
if stats_provider:match("^library:") then
stats_provider = stats_provider:match(":(.+)$");
else
stats_provider = builtin_providers[stats_provider];
if not stats_provider then
log("error", "Unrecognized built-in statistics provider '%s', using internal instead", stats_provider_config);
stats_provider = builtin_providers["internal"];
end
end
local have_stats_provider, stats_lib = pcall(require, stats_provider);
local stats, stats_err;
if not have_stats_provider then
stats, stats_err = nil, stats_lib;
else
local stats_config = config.get("*", "statistics_config");
stats, stats_err = stats_lib.new(stats_config);
end
if not stats then
log("error", "Error loading statistics provider '%s': %s", stats_provider, stats_err);
end
local measure, collect;
local latest_stats = {};
local changed_stats = {};
local stats_extra = {};
if stats_interval then
log("debug", "Statistics collection is enabled every %d seconds", stats_interval);
if stats then
function measure(type, name)
local f = assert(stats[type], "unknown stat type: "..type);
return f(name);
end
end
local mark_collection_start = measure("times", "stats.collection");
local mark_processing_start = measure("times", "stats.processing");
if stats_interval then
if stats.get_stats then
log("debug", "Statistics collection is enabled every %d seconds", stats_interval);
function collect()
local mark_collection_done = mark_collection_start();
fire_event("stats-update");
changed_stats, stats_extra = {}, {};
for stat_name, getter in pairs(stats.get_stats()) do
local type, value, extra = getter();
local old_value = latest_stats[stat_name];
latest_stats[stat_name] = value;
if value ~= old_value then
changed_stats[stat_name] = value;
end
if extra then
stats_extra[stat_name] = extra;
local mark_collection_start = measure("times", "stats.collection");
local mark_processing_start = measure("times", "stats.processing");
function collect()
local mark_collection_done = mark_collection_start();
fire_event("stats-update");
changed_stats, stats_extra = {}, {};
for stat_name, getter in pairs(stats.get_stats()) do
local type, value, extra = getter();
local old_value = latest_stats[stat_name];
latest_stats[stat_name] = value;
if value ~= old_value then
changed_stats[stat_name] = value;
end
if extra then
stats_extra[stat_name] = extra;
end
end
mark_collection_done();
local mark_processing_done = mark_processing_start();
fire_event("stats-updated", { stats = latest_stats, changed_stats = changed_stats, stats_extra = stats_extra });
mark_processing_done();
return stats_interval;
end
mark_collection_done();
local mark_processing_done = mark_processing_start();
fire_event("stats-updated", { stats = latest_stats, changed_stats = changed_stats, stats_extra = stats_extra });
mark_processing_done();
return stats_interval;
timer.add_task(stats_interval, collect);
prosody.events.add_handler("server-started", function () collect() end, -1);
else
log("error", "statistics_interval specified, but the selected statistics_provider (%s) does not support statistics collection", stats_provider_config or "internal");
end
end
timer.add_task(stats_interval, collect);
prosody.events.add_handler("server-started", function () collect() end, -1);
else
if not stats_interval and stats_provider == "util.statistics" then
log("debug", "Statistics collection is disabled");
-- nop
function measure()
@ -62,7 +101,6 @@ end
return {
measure = measure;
collect = collect;
get_stats = function ()
return latest_stats, changed_stats, stats_extra;
end;