mirror of
https://github.com/craigerl/aprsd.git
synced 2024-09-29 16:46:43 -04:00
Cleaned up the KeepAlive output
This patch cleans up the KeepAlive output a bit.
This commit is contained in:
parent
8bfdefd5ad
commit
51894bbab8
@ -141,14 +141,14 @@ class APRSDStats:
|
|||||||
"thread_last_update": str(now - self._email_thread_last_time),
|
"thread_last_update": str(now - self._email_thread_last_time),
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
LOG.debug("STATS {}".format(stats))
|
|
||||||
return stats
|
return stats
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
return (
|
return (
|
||||||
"Msgs TX:{} RX:{} ACK: TX:{} RX:{} "
|
"Uptime:{} Msgs TX:{} RX:{} "
|
||||||
"Email TX:{} RX:{} LastLoop:{} "
|
"ACK: TX:{} RX:{} "
|
||||||
"Uptime: {}".format(
|
"Email TX:{} RX:{} LastLoop:{} ".format(
|
||||||
|
self.uptime,
|
||||||
self._msgs_tx,
|
self._msgs_tx,
|
||||||
self._msgs_rx,
|
self._msgs_rx,
|
||||||
self._ack_tx,
|
self._ack_tx,
|
||||||
@ -156,6 +156,5 @@ class APRSDStats:
|
|||||||
self._email_tx,
|
self._email_tx,
|
||||||
self._email_rx,
|
self._email_rx,
|
||||||
self._email_thread_last_time,
|
self._email_thread_last_time,
|
||||||
self.uptime,
|
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
@ -82,12 +82,13 @@ class KeepAliveThread(APRSDThread):
|
|||||||
email_thread_time = "N/A"
|
email_thread_time = "N/A"
|
||||||
|
|
||||||
LOG.debug(
|
LOG.debug(
|
||||||
"Tracker({}) EmailThread: {} "
|
"Uptime ({}) Tracker({}) "
|
||||||
" Msgs: TX:{} RX:{}".format(
|
"Msgs: TX:{} RX:{} EmailThread: {}".format(
|
||||||
|
stats_obj.uptime,
|
||||||
len(tracker),
|
len(tracker),
|
||||||
email_thread_time,
|
|
||||||
stats_obj.msgs_tx,
|
stats_obj.msgs_tx,
|
||||||
stats_obj.msgs_rx,
|
stats_obj.msgs_rx,
|
||||||
|
email_thread_time,
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
self.cntr += 1
|
self.cntr += 1
|
||||||
@ -105,13 +106,6 @@ class APRSDRXThread(APRSDThread):
|
|||||||
self.thread_stop = True
|
self.thread_stop = True
|
||||||
client.get_client().stop()
|
client.get_client().stop()
|
||||||
|
|
||||||
def callback(self, packet):
|
|
||||||
try:
|
|
||||||
packet = aprslib.parse(packet)
|
|
||||||
print(packet)
|
|
||||||
except (aprslib.ParseError, aprslib.UnknownFormat):
|
|
||||||
pass
|
|
||||||
|
|
||||||
def loop(self):
|
def loop(self):
|
||||||
aprs_client = client.get_client()
|
aprs_client = client.get_client()
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user