From 11f749e0e94a0659d2cc2c0867cd06d871043afb Mon Sep 17 00:00:00 2001 From: Rigear <278971+Rigear@users.noreply.github.com> Date: Sun, 19 Apr 2026 18:04:36 -0700 Subject: [PATCH] fix: Initialize tls_verified and properly handle when mqtt_broker is None --- repeater/data_acquisition/mqtt_handler.py | 2 ++ repeater/data_acquisition/storage_collector.py | 9 ++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/repeater/data_acquisition/mqtt_handler.py b/repeater/data_acquisition/mqtt_handler.py index af4ea0f..a3672ff 100644 --- a/repeater/data_acquisition/mqtt_handler.py +++ b/repeater/data_acquisition/mqtt_handler.py @@ -125,6 +125,8 @@ class _BrokerConnection: self.enabled = broker.get("enabled", False) self.retain_status = broker.get("retain_status", False) + self._tls_verified = False + if self.base_topic is None: if self.format == "mqtt": self.base_topic = f"meshcore/repeater/{self.node_name}" diff --git a/repeater/data_acquisition/storage_collector.py b/repeater/data_acquisition/storage_collector.py index daf8d54..571e620 100644 --- a/repeater/data_acquisition/storage_collector.py +++ b/repeater/data_acquisition/storage_collector.py @@ -188,20 +188,23 @@ class StorageCollector: def record_advert(self, advert_record: dict): self.sqlite_handler.store_advert(advert_record) - self.mqtt_handler.publish_mqtt("advert", advert_record) + if self.mqtt_handler: + self.mqtt_handler.publish_mqtt("advert", advert_record) self._publish_to_glass(advert_record, "advert") def record_noise_floor(self, noise_floor_dbm: float): noise_record = {"timestamp": time.time(), "noise_floor_dbm": noise_floor_dbm} self.sqlite_handler.store_noise_floor(noise_record) - self.mqtt_handler.publish_mqtt("noise_floor", noise_record) + if self.mqtt_handler: + self.mqtt_handler.publish_mqtt("noise_floor", noise_record) self._publish_to_glass(noise_record, "noise_floor") def record_crc_errors(self, count: int): """Record a batch of CRC errors detected since last poll.""" crc_record = {"timestamp": time.time(), "count": count} self.sqlite_handler.store_crc_errors(crc_record) - self.mqtt_handler.publish_mqtt("crc_errors", crc_record) + if self.mqtt_handler: + self.mqtt_handler.publish_mqtt("crc_errors", crc_record) self._publish_to_glass(crc_record, "crc_errors") def get_crc_error_count(self, hours: int = 24) -> int: