dandri/MeshCore-mqtt-observer
1
0
Fork 0
mirror of https://github.com/agessaman/MeshCore.git synced 2026-10-16 08:50:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(observer): read bridge state through published snapshots

Browse Source 
The alert reporter sampled slot monitoring, outage start and preset
name in three separate live reads, so a slot could change underneath
them. It now takes one outage snapshot per slot. The role stats JSON
uses the shared slot emitter, and both roles call bridge->loop() so
the loop task can publish its owned inputs to the worker.
This commit is contained in:
agessaman
2026-09-21 16:05:54 -07:00
parent d2b96da64a
commit 0fc5ffe4a4
3 changed files with 10 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/helpers/AlertReporter.cpp
+5 -4
View File
@@ -247,11 +247,12 @@ void AlertReporter::onLoop(unsigned long now_ms) {
for (int i = 0; i < n; i++) {
AlertFaultPolicy::Fault& f = _mqtt[i];
if (!_bridge->isSlotEnabledAndAttempted(i)) {
const MQTTBridge::SlotOutageSnapshot slot = _bridge->getSlotOutageSnapshot(i);
if (!slot.monitored) {
AlertFaultPolicy::rearmIfDisabled(f);
continue;
}
const uint32_t outage_start = (uint32_t)_bridge->getSlotCurrentOutageStartMs(i);
const uint32_t outage_start = slot.started_ms;
const AlertFaultPolicy::OutageSnapshot snap =
AlertFaultPolicy::fromStartMs(outage_start);
AlertFaultPolicy::TickResult r = AlertFaultPolicy::tick(
@@ -259,7 +260,7 @@ void AlertReporter::onLoop(unsigned long now_ms) {
if (r.action == AlertFaultPolicy::Action::FireDown) {
char text[100];
AlertFaultPolicy::formatMqttDown(text, sizeof(text), i + 1,
_bridge->getSlotPresetName(i),
slot.name,
r.duration_ms);
if (sendChannel(text)) {
AlertFaultPolicy::commitDown(f, now, outage_start);
@@ -267,7 +268,7 @@ void AlertReporter::onLoop(unsigned long now_ms) {
} else if (r.action == AlertFaultPolicy::Action::FireRecovered) {
char text[100];
AlertFaultPolicy::formatMqttRecovered(text, sizeof(text), i + 1,
_bridge->getSlotPresetName(i),
slot.name,
r.duration_ms);
sendChannel(text);
AlertFaultPolicy::commitRecovered(f);