fix(mqtt): gate room-server OTA on an unproven stop; reap late acks
- The room server checked canFlashAfterStop() only when the bridge was
running at OTA time. After a timed-out restart the bridge reads as
stopped while its unacknowledged task may still own TLS/client state,
so an OTA could erase and write flash under it. It now refuses while
the stop is unproven, after first reaping any late ack. The repeater
already gated unconditionally.
- MyMesh::loop() now reaps a late stop acknowledgement whenever it lands,
releasing the withheld queue and buffers, and restarts only when a
resume is pending and the bridge is enabled. Before, a bridge disabled
during StopUnproven kept those resources until re-enabled or rebooted.
pollLateStopAck() is public for this.
- The wrapper's destructor no longer stops an already-stopped client:
destroySlotClients() had just stopped it, so every shutdown logged five
spurious "esp_mqtt_client_stop failed: ESP_FAIL" errors.
Hardware (Heltec V4, 1 s test stop deadline): restart -> StopUnproven ->
`set bridge.enabled off`; the late ack was reaped ("releasing withheld
resources"), status read "not running", and `set bridge.enabled on`
started cleanly without a second release.
This commit is contained in:
1 parent
0b75cb9314
commit
172ef36843
4 files changed
+30
-19
No files matched your search
@@ -20,7 +20,8 @@ PsychicMqttClient::PsychicMqttClient() : _mqtt_cfg()
|
||||
|
||||
PsychicMqttClient::~PsychicMqttClient()
|
||||
{
|
||||
disconnect();
|
||||
// Owners stop the client before deleting it; stopping it again only logs ESP_FAIL.
|
||||
if (_started) disconnect();
|
||||
if (_client != nullptr)
|
||||
{
|
||||
esp_mqtt_client_destroy(_client);
|
||||
|
||||
Reference in new issue
Block a user