Mercurial > prosody-modules
view mod_measure_cpu/mod_measure_cpu.lua @ 5285:8e1f1eb00b58
mod_sasl2_fast: Fix harmless off-by-one error (invalidates existing tokens!)
Problem:
This was causing the key to become "<token>--cur" instead of the expected
"<token>-cur". As the same key was used by the code to both set and get, it
still worked.
Rationale for change:
Although it worked, it's unintended, inconsistent and messy. It increases the
chances of future bugs due to the unexpected format.
Side-effects of change:
Existing '--cur' entries will not be checked after this change, and therefore
existing FAST clients will fail to authenticate until they attempt password
auth and obtain a new FAST token.
Existing '--cur' entries in storage will not be cleaned up by this commit, but
this is considered a minor issue, and okay for the relatively few FAST
deployments.
author | Matthew Wild <mwild1@gmail.com> |
---|---|
date | Wed, 29 Mar 2023 16:12:15 +0100 |
parents | 2af0301af734 |
children |
line wrap: on
line source
module:set_global(); local measure = require"core.statsmanager".measure; local mt = require"util.multitable"; local get_time = require "socket".gettime; local get_clock = os.clock; local measure_cpu_now = measure("amount", "cpu.percent"); -- Current percentage local measure_cpu_total = measure("counter", "cpu.clock", { units = "seconds" }); local last_cpu_wall, last_cpu_clock; module:hook("stats-update", function () local new_wall, new_clock = get_time(), get_clock(); local pc = 0; if last_cpu_wall then pc = 100/((new_wall-last_cpu_wall)/(new_clock-last_cpu_clock)); end last_cpu_wall, last_cpu_clock = new_wall, new_clock; measure_cpu_now(pc); measure_cpu_total(new_clock); end); -- Some metadata for mod_munin local munin_meta = mt.new(); munin_meta.data = module:shared"munin/meta"; local key = "global_cpu_amount"; munin_meta:set(key, "", "graph_args", "--base 1000 -r --lower-limit 0 --upper-limit 100"); munin_meta:set(key, "", "graph_title", "Prosody CPU Usage"); munin_meta:set(key, "", "graph_vlabel", "%"); munin_meta:set(key, "", "graph_category", "cpu"); munin_meta:set(key, "percent", "label", "CPU Usage"); munin_meta:set(key, "percent", "min", "0");