From 0fe175f342e11412288572bbb1d7ea37b7df2b8e Mon Sep 17 00:00:00 2001 From: Graham McIntire Date: Sun, 15 Jun 2025 19:10:22 -0500 Subject: [PATCH] adjust status page --- lib/aprs/is/is.ex | 28 +++++++++++++------------- lib/aprs_web/live/status_live/index.ex | 4 ++-- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/lib/aprs/is/is.ex b/lib/aprs/is/is.ex index 507ecde..2d89da4 100644 --- a/lib/aprs/is/is.ex +++ b/lib/aprs/is/is.ex @@ -33,9 +33,9 @@ defmodule Aprs.Is do packet_stats = %{ total_packets: 0, last_packet_at: nil, - packets_per_minute: 0, - last_minute_count: 0, - last_minute_timestamp: System.system_time(:second) + packets_per_second: 0, + last_second_count: 0, + last_second_timestamp: System.system_time(:second) } # Set up ets tables @@ -355,24 +355,24 @@ defmodule Aprs.Is do defp update_packet_stats(stats, current_time) do new_total = stats.total_packets + 1 - # Check if we need to reset the per-minute counter - if current_time - stats.last_minute_timestamp >= 60 do + # Check if we need to reset the per-second counter + if current_time - stats.last_second_timestamp >= 1 do %{ total_packets: new_total, last_packet_at: DateTime.utc_now(), - packets_per_minute: 1, - last_minute_count: 1, - last_minute_timestamp: current_time + packets_per_second: 1, + last_second_count: 1, + last_second_timestamp: current_time } else - new_minute_count = stats.last_minute_count + 1 + new_second_count = stats.last_second_count + 1 %{ stats | total_packets: new_total, last_packet_at: DateTime.utc_now(), - packets_per_minute: new_minute_count, - last_minute_count: new_minute_count + packets_per_second: new_second_count, + last_second_count: new_second_count } end end @@ -385,9 +385,9 @@ defmodule Aprs.Is do %{ total_packets: 0, last_packet_at: nil, - packets_per_minute: 0, - last_minute_count: 0, - last_minute_timestamp: System.system_time(:second) + packets_per_second: 0, + last_second_count: 0, + last_second_timestamp: System.system_time(:second) } end end diff --git a/lib/aprs_web/live/status_live/index.ex b/lib/aprs_web/live/status_live/index.ex index 03aac98..2e153e5 100644 --- a/lib/aprs_web/live/status_live/index.ex +++ b/lib/aprs_web/live/status_live/index.ex @@ -181,9 +181,9 @@ defmodule AprsWeb.StatusLive.Index do
- Packets/Min: + Packets/Sec: - {@aprs_status.packet_stats.packets_per_minute} + {@aprs_status.packet_stats.packets_per_second}