From 51894bbab88bada9622c4cf31f1d928943ed8ac5 Mon Sep 17 00:00:00 2001
From: Hemna <waboring@hemna.com>
Date: Fri, 22 Jan 2021 16:05:48 -0500
Subject: [PATCH] Cleaned up the KeepAlive output

This patch cleans up the KeepAlive output a bit.
---
 aprsd/stats.py   |  9 ++++-----
 aprsd/threads.py | 14 ++++----------
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/aprsd/stats.py b/aprsd/stats.py
index c4345e2..30c9f5a 100644
--- a/aprsd/stats.py
+++ b/aprsd/stats.py
@@ -141,14 +141,14 @@ class APRSDStats:
                 "thread_last_update": str(now - self._email_thread_last_time),
             },
         }
-        LOG.debug("STATS {}".format(stats))
         return stats
 
     def __str__(self):
         return (
-            "Msgs TX:{} RX:{} ACK: TX:{} RX:{}  "
-            "Email TX:{} RX:{} LastLoop:{} "
-            "Uptime: {}".format(
+            "Uptime:{} Msgs TX:{} RX:{} "
+            "ACK: TX:{} RX:{} "
+            "Email TX:{} RX:{} LastLoop:{} ".format(
+                self.uptime,
                 self._msgs_tx,
                 self._msgs_rx,
                 self._ack_tx,
@@ -156,6 +156,5 @@ class APRSDStats:
                 self._email_tx,
                 self._email_rx,
                 self._email_thread_last_time,
-                self.uptime,
             )
         )
diff --git a/aprsd/threads.py b/aprsd/threads.py
index b4b6ca6..ea595e9 100644
--- a/aprsd/threads.py
+++ b/aprsd/threads.py
@@ -82,12 +82,13 @@ class KeepAliveThread(APRSDThread):
                 email_thread_time = "N/A"
 
             LOG.debug(
-                "Tracker({}) EmailThread: {} "
-                "  Msgs: TX:{}  RX:{}".format(
+                "Uptime ({}) Tracker({}) "
+                "Msgs: TX:{} RX:{} EmailThread: {}".format(
+                    stats_obj.uptime,
                     len(tracker),
-                    email_thread_time,
                     stats_obj.msgs_tx,
                     stats_obj.msgs_rx,
+                    email_thread_time,
                 ),
             )
         self.cntr += 1
@@ -105,13 +106,6 @@ class APRSDRXThread(APRSDThread):
         self.thread_stop = True
         client.get_client().stop()
 
-    def callback(self, packet):
-        try:
-            packet = aprslib.parse(packet)
-            print(packet)
-        except (aprslib.ParseError, aprslib.UnknownFormat):
-            pass
-
     def loop(self):
         aprs_client = client.get_client()