refactor(threads): migrate KeepAliveThread to Event-based timing

aprsd/threads/keepalive.py

@@ -1,6 +1,5 @@
 import datetime
 import logging
-import time
 import tracemalloc
 
 from loguru import logger
@@ -20,6 +19,7 @@ LOGU = logger
 class KeepAliveThread(APRSDThread):
     cntr = 0
     checker_time = datetime.datetime.now()
+    period = 60
 
     def __init__(self):
         tracemalloc.start()
@@ -28,81 +28,80 @@ class KeepAliveThread(APRSDThread):
         self.max_delta = datetime.timedelta(**max_timeout)
 
     def loop(self):
-        if self.loop_count % 60 == 0:
-            stats_json = collector.Collector().collect()
-            pl = packets.PacketList()
-            thread_list = APRSDThreadList()
-            now = datetime.datetime.now()
+        stats_json = collector.Collector().collect()
+        pl = packets.PacketList()
+        thread_list = APRSDThreadList()
+        now = datetime.datetime.now()
 
-            if (
-                'APRSClientStats' in stats_json
-                and stats_json['APRSClientStats'].get('transport') == 'aprsis'
-            ):
-                if stats_json['APRSClientStats'].get('server_keepalive'):
-                    last_msg_time = utils.strfdelta(
-                        now - stats_json['APRSClientStats']['server_keepalive']
-                    )
-                else:
-                    last_msg_time = 'N/A'
+        if (
+            'APRSClientStats' in stats_json
+            and stats_json['APRSClientStats'].get('transport') == 'aprsis'
+        ):
+            if stats_json['APRSClientStats'].get('server_keepalive'):
+                last_msg_time = utils.strfdelta(
+                    now - stats_json['APRSClientStats']['server_keepalive']
+                )
             else:
                 last_msg_time = 'N/A'
+        else:
+            last_msg_time = 'N/A'
 
-            tracked_packets = stats_json['PacketTrack']['total_tracked']
-            tx_msg = 0
-            rx_msg = 0
-            if 'PacketList' in stats_json:
-                msg_packets = stats_json['PacketList'].get('MessagePacket')
-                if msg_packets:
-                    tx_msg = msg_packets.get('tx', 0)
-                    rx_msg = msg_packets.get('rx', 0)
+        tracked_packets = stats_json['PacketTrack']['total_tracked']
+        tx_msg = 0
+        rx_msg = 0
+        if 'PacketList' in stats_json:
+            msg_packets = stats_json['PacketList'].get('MessagePacket')
+            if msg_packets:
+                tx_msg = msg_packets.get('tx', 0)
+                rx_msg = msg_packets.get('rx', 0)
 
-            keepalive = (
-                '{} - Uptime {} RX:{} TX:{} Tracker:{} Msgs TX:{} RX:{} '
-                'Last:{} - RAM Current:{} Peak:{} Threads:{} LoggingQueue:{}'
-            ).format(
-                stats_json['APRSDStats']['callsign'],
-                stats_json['APRSDStats']['uptime'],
-                pl.total_rx(),
-                pl.total_tx(),
-                tracked_packets,
-                tx_msg,
-                rx_msg,
-                last_msg_time,
-                stats_json['APRSDStats']['memory_current_str'],
-                stats_json['APRSDStats']['memory_peak_str'],
-                len(thread_list),
-                aprsd_log.logging_queue.qsize(),
-            )
-            LOG.info(keepalive)
-            if 'APRSDThreadList' in stats_json:
-                thread_list = stats_json['APRSDThreadList']
-                for thread_name in thread_list:
-                    thread = thread_list[thread_name]
-                    alive = thread['alive']
-                    age = thread['age']
-                    key = thread['name']
-                    if not alive:
-                        LOG.error(f'Thread {thread}')
+        keepalive = (
+            '{} - Uptime {} RX:{} TX:{} Tracker:{} Msgs TX:{} RX:{} '
+            'Last:{} - RAM Current:{} Peak:{} Threads:{} LoggingQueue:{}'
+        ).format(
+            stats_json['APRSDStats']['callsign'],
+            stats_json['APRSDStats']['uptime'],
+            pl.total_rx(),
+            pl.total_tx(),
+            tracked_packets,
+            tx_msg,
+            rx_msg,
+            last_msg_time,
+            stats_json['APRSDStats']['memory_current_str'],
+            stats_json['APRSDStats']['memory_peak_str'],
+            len(thread_list),
+            aprsd_log.logging_queue.qsize(),
+        )
+        LOG.info(keepalive)
+        if 'APRSDThreadList' in stats_json:
+            thread_list = stats_json['APRSDThreadList']
+            for thread_name in thread_list:
+                thread = thread_list[thread_name]
+                alive = thread['alive']
+                age = thread['age']
+                key = thread['name']
+                if not alive:
+                    LOG.error(f'Thread {thread}')
 
-                    thread_hex = f'fg {utils.hex_from_name(key)}'
-                    t_name = f'<{thread_hex}>{key:<15}</{thread_hex}>'
-                    thread_msg = f'{t_name} Alive? {str(alive): <5} {str(age): <20}'
-                    LOGU.opt(colors=True).info(thread_msg)
-                    # LOG.info(f"{key: <15} Alive? {str(alive): <5} {str(age): <20}")
+                thread_hex = f'fg {utils.hex_from_name(key)}'
+                t_name = f'<{thread_hex}>{key:<15}</{thread_hex}>'
+                thread_msg = f'{t_name} Alive? {str(alive): <5} {str(age): <20}'
+                LOGU.opt(colors=True).info(thread_msg)
+                # LOG.info(f"{key: <15} Alive? {str(alive): <5} {str(age): <20}")
 
-            # Go through the registered keepalive collectors
-            # and check them as well as call log.
-            collect = keepalive_collector.KeepAliveCollector()
-            collect.check()
-            collect.log()
+        # Go through the registered keepalive collectors
+        # and check them as well as call log.
+        collect = keepalive_collector.KeepAliveCollector()
+        collect.check()
+        collect.log()
 
-            # Check version every day
-            delta = now - self.checker_time
-            if delta > datetime.timedelta(hours=24):
-                self.checker_time = now
-                level, msg = utils._check_version()
-                if level:
-                    LOG.warning(msg)
-            self.cntr += 1
-        time.sleep(1)
+        # Check version every day
+        delta = now - self.checker_time
+        if delta > datetime.timedelta(hours=24):
+            self.checker_time = now
+            level, msg = utils._check_version()
+            if level:
+                LOG.warning(msg)
+        self.cntr += 1
+        self.wait()
         return True