hemna/aprsd
1
0
Fork 0
mirror of https://github.com/craigerl/aprsd.git synced 2024-11-26 18:08:36 -05:00
Code Issues Projects Releases Wiki Activity

Added some changes to listen

Browse Source 
to collect stats and only show those stats during listen
This commit is contained in:
Hemna 2024-10-31 09:17:36 -04:00
parent 3fd606946d
commit 7dc0aee9e6
1 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
aprsd/cmds/listen.py
View File

@ -135,14 +135,21 @@ class ListenStatsThread(APRSDThread):
if self.loop_count % 10 == 0: if self.loop_count % 10 == 0:
# log the stats every 10 seconds # log the stats every 10 seconds
stats_json = collector.Collector().collect() stats_json = collector.Collector().collect()
stats = stats_json["SimplePacketStats"] stats = stats_json["PacketList"]
total_rx = stats["total_rx"] total_rx = stats["rx"]
rate = (total_rx - self._last_total_rx) / 10 rate = (total_rx - self._last_total_rx) / 10
LOG.warning(f"RX Rate: {rate} pps Total RX: {total_rx} - {self._last_total_rx}") LOGU.opt(colors=True).info(
#LOG.error(stats) f"<green>RX Rate: {rate} pps</green> "
f"<yellow>Total RX: {total_rx}</yellow> "
f"<red>RX Last 10 secs: {total_rx - self._last_total_rx}</red>",
)
self._last_total_rx = total_rx self._last_total_rx = total_rx
for k, v in stats["types"].items(): for k, v in stats["types"].items():
LOGU.opt(colors=True).warning(f"Type: {k} <blue>RX: {v['rx']}</blue> <red>TX: {v['tx']}</red>") thread_hex = f"fg {utils.hex_from_name(k)}"
LOGU.opt(colors=True).info(
f"<{thread_hex}>{k:<15}</{thread_hex}> "
f"<blue>RX: {v['rx']}</blue> <red>TX: {v['tx']}</red>",
)
time.sleep(1) time.sleep(1)
return True return True
@ -261,26 +268,23 @@ def listen(
# just deregister the class from the packet collector # just deregister the class from the packet collector
packet_collector.PacketCollector().unregister(seen_list.SeenList) packet_collector.PacketCollector().unregister(seen_list.SeenList)
packet_collector.PacketCollector().register(SimplePacketStats) # from aprsd.client import stats as client_stats
# from aprsd.packets.packet_list import PacketList # noqa: F401
from aprsd.client import stats as client_stats # from aprsd.packets.seen_list import SeenList # noqa: F401
from aprsd.packets.packet_list import PacketList # noqa: F401 # from aprsd.packets.tracker import PacketTrack # noqa: F401
from aprsd.packets.seen_list import SeenList # noqa: F401 # from aprsd.packets.watch_list import WatchList # noqa: F401
from aprsd.packets.tracker import PacketTrack # noqa: F401 # from aprsd.plugins import email
from aprsd.packets.watch_list import WatchList # noqa: F401 # from aprsd.threads import aprsd as aprsd_thread
from aprsd.plugins import email # c = collector.Collector()
from aprsd.threads import aprsd as aprsd_thread # # c.unregister_producer(app.APRSDStats)
c = collector.Collector() # c.unregister_producer(PacketList)
# c.unregister_producer(app.APRSDStats) # c.unregister_producer(WatchList)
c.unregister_producer(PacketList) # #c.unregister_producer(PacketTrack)
c.unregister_producer(WatchList) # c.unregister_producer(plugin.PluginManager)
#c.unregister_producer(PacketTrack) # c.unregister_producer(aprsd_thread.APRSDThreadList)
c.unregister_producer(plugin.PluginManager) # c.unregister_producer(email.EmailStats)
c.unregister_producer(aprsd_thread.APRSDThreadList) # c.unregister_producer(client_stats.APRSClientStats)
c.unregister_producer(email.EmailStats) # c.unregister_producer(seen_list.SeenList)
c.unregister_producer(client_stats.APRSClientStats)
c.unregister_producer(seen_list.SeenList)
c.register_producer(SimplePacketStats)
pm = None pm = None
pm = plugin.PluginManager() pm = plugin.PluginManager()