hemna/aprsd
1
0
Fork 0
mirror of https://github.com/craigerl/aprsd.git synced 2025-09-03 13:47:51 -04:00
Code Issues Projects Releases Wiki Activity

Updated keepalive thread to report client

Browse Source 
This patch updates the keepalive thread and the
aprsis client and kiss client to report keepalive.
This commit is contained in:
Hemna 2024-11-26 12:35:36 -05:00
parent a17b80ddd8
commit 8529f1f8d1
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
aprsd/client/aprsis.py
View File

@ -38,7 +38,7 @@ class APRSISClient(base.APRSClient):
"connected": self.is_connected, "connected": self.is_connected,
"filter": self.filter, "filter": self.filter,
"login_status": self.login_status, "login_status": self.login_status,
"server_keepalive": keepalive, "connection_keepalive": keepalive,
"server_string": server_string, "server_string": server_string,
"transport": self.transport(), "transport": self.transport(),
} }

14
aprsd/client/kiss.py
View File

@ -1,3 +1,4 @@
import datetime
import logging import logging
import aprslib import aprslib
@ -16,12 +17,17 @@ LOG = logging.getLogger("APRSD")
class KISSClient(base.APRSClient): class KISSClient(base.APRSClient):
_client = None _client = None
keepalive = datetime.datetime.now()
def stats(self, serializable=False) -> dict: def stats(self, serializable=False) -> dict:
stats = {} stats = {}
if self.is_configured(): if self.is_configured():
keepalive = self.keepalive
if serializable:
keepalive = keepalive.isoformat()
stats = { stats = {
"connected": self.is_connected, "connected": self.is_connected,
"connection_keepalive": keepalive,
"transport": self.transport(), "transport": self.transport(),
} }
if self.transport() == client.TRANSPORT_TCPKISS: if self.transport() == client.TRANSPORT_TCPKISS:
@ -110,5 +116,9 @@ class KISSClient(base.APRSClient):
return self._client return self._client
def consumer(self, callback, blocking=False, immortal=False, raw=False): def consumer(self, callback, blocking=False, immortal=False, raw=False):
LOG.info(f"{self.__class__.__name__}.consumer called") try:
self._client.consumer(callback) self._client.consumer(callback)
self.keepalive = datetime.datetime.now()
except Exception as ex:
LOG.error(f"Consumer failed {ex}")
LOG.error(ex)

2
aprsd/threads/keep_alive.py
View File

@ -100,7 +100,7 @@ class KeepAliveThread(APRSDThread):
# check the APRS connection # check the APRS connection
cl = client_factory.create() cl = client_factory.create()
cl_stats = cl.stats() cl_stats = cl.stats()
ka = cl_stats.get("keepalive", None) ka = cl_stats.get("connection_keepalive", None)
if ka: if ka:
keepalive = timeago.format(ka) keepalive = timeago.format(ka)
else: else: