aprsd 4.2.1__py3-none-any.whl → 4.2.3__py3-none-any.whl

aprsd/client/client.py

@@ -10,14 +10,14 @@ from oslo_config import cfg
 from aprsd.client import drivers  # noqa - ensure drivers are registered
 from aprsd.client.drivers.registry import DriverRegistry
 from aprsd.packets import core
-from aprsd.utils import keepalive_collector
+from aprsd.utils import keepalive_collector, trace
 
 CONF = cfg.CONF
 LOG = logging.getLogger('APRSD')
 LOGU = logger
 
 
-class APRSDClient:
+class APRSDClient(metaclass=trace.TraceWrapperMetaclass):
     """APRSD client class.
 
     This is a singleton class that provides a single instance of the APRSD client.
@@ -41,11 +41,13 @@ class APRSDClient:
     def __init__(self, auto_connect: bool = True):
         self.auto_connect = auto_connect
         self.connected = False
+        self.running = False
         self.login_status = {
             'success': False,
             'message': None,
         }
-        self.driver = DriverRegistry().get_driver()
+        if not self.driver:
+            self.driver = DriverRegistry().get_driver()
         if self.auto_connect:
             self.connect()
 
@@ -100,14 +102,20 @@ class APRSDClient:
         return self.driver.filter
 
     def is_alive(self):
-        return self.driver.is_alive()
+        return self.driver.is_alive
 
+    @wrapt.synchronized(lock)
     def connect(self):
         if not self.driver:
             self.driver = DriverRegistry().get_driver()
-        self.driver.setup_connection()
+        if not self.connected:
+            self.driver.setup_connection()
+            self.connected = self.driver.is_alive
+        self.running = True
 
     def close(self):
+        self.running = False
+        self.connected = False
         if not self.driver:
             return
         self.driver.close()
@@ -115,10 +123,10 @@ class APRSDClient:
     @wrapt.synchronized(lock)
     def reset(self):
         """Call this to force a rebuild/reconnect."""
-        LOG.info('Resetting client connection.')
+        LOG.warning('Resetting client connection.')
         if self.driver:
             self.driver.close()
-            if not self.delay_connect:
+            if self.auto_connect:
                 self.driver.setup_connection()
             if self.filter:
                 self.driver.set_filter(self.filter)
@@ -126,7 +134,11 @@ class APRSDClient:
             LOG.warning('Client not initialized, nothing to reset.')
 
     def send(self, packet: core.Packet) -> bool:
-        return self.driver.send(packet)
+        if self.running:
+            return self.driver.send(packet)
+        else:
+            LOG.error('Client not running, not sending packet.')
+            return False
 
     # For the keepalive collector
     def keepalive_check(self):
@@ -145,7 +157,8 @@ class APRSDClient:
         LOGU.opt(colors=True).info(f'<green>Client keepalive {keepalive}</green>')
 
     def consumer(self, callback: Callable, raw: bool = False):
-        return self.driver.consumer(callback=callback, raw=raw)
+        if self.running:
+            return self.driver.consumer(callback=callback, raw=raw)
 
     def decode_packet(self, *args, **kwargs) -> core.Packet:
         try:

aprsd/client/drivers/aprsis.py

@@ -10,6 +10,7 @@ from oslo_config import cfg
 from aprsd import client, exception
 from aprsd.client.drivers.lib.aprslib import APRSLibClient
 from aprsd.packets import core
+from aprsd.utils import singleton
 
 CONF = cfg.CONF
 LOG = logging.getLogger('APRSD')
@@ -17,6 +18,7 @@ LOGU = logger
 
 
 # class APRSISDriver(metaclass=trace.TraceWrapperMetaclass):
+@singleton
 class APRSISDriver:
     """This is the APRS-IS driver for the APRSD client.
 
@@ -78,16 +80,18 @@ class APRSISDriver:
         if self._client:
             self._client.stop()
             self._client.close()
+        self.connected = False
 
     def send(self, packet: core.Packet) -> bool:
         return self._client.send(packet)
 
     def setup_connection(self):
+        if self.connected:
+            return
         user = CONF.aprs_network.login
         password = CONF.aprs_network.password
         host = CONF.aprs_network.host
         port = CONF.aprs_network.port
-        self.connected = False
         backoff = 1
         retries = 3
         retry_count = 0
@@ -97,7 +101,7 @@ class APRSISDriver:
                 break
             try:
                 LOG.info(
-                    f'Creating aprslib client({host}:{port}) and logging in {user}.'
+                    f'Creating aprslib client({host}:{port}) and logging in {user}. try #{retry_count}'
                 )
                 self._client = APRSLibClient(
                     user, passwd=password, host=host, port=port
@@ -152,7 +156,7 @@ class APRSISDriver:
     def _is_stale_connection(self):
         delta = datetime.datetime.now() - self._client.aprsd_keepalive
         if delta > self.max_delta:
-            LOG.error(f'Connection is stale, last heard {delta} ago.')
+            LOG.warning(f'Connection is stale, last heard {delta} ago.')
             return True
         return False
 

aprsd/client/drivers/fake.py

@@ -64,7 +64,7 @@ class APRSDFakeDriver(metaclass=trace.TraceWrapperMetaclass):
         return None
 
     @wrapt.synchronized(lock)
-    def send(self, packet: core.Packet):
+    def send(self, packet: core.Packet) -> bool:
         """Send an APRS Message object."""
         LOG.info(f'Sending packet: {packet}')
         payload = None
@@ -84,6 +84,7 @@ class APRSDFakeDriver(metaclass=trace.TraceWrapperMetaclass):
             f"FAKE::Send '{payload}' TO '{packet.to_call}' From "
             f'\'{packet.from_call}\' with PATH "{self.path}"',
         )
+        return True
 
     def consumer(self, callback: Callable, raw: bool = False):
         LOG.debug('Start non blocking FAKE consumer')

aprsd/client/drivers/registry.py

@@ -20,6 +20,7 @@ class ClientDriver(Protocol):
     def is_configured(self) -> bool:
         pass
 
+    @property
     def is_alive(self) -> bool:
         pass
 

aprsd/client/drivers/tcpkiss.py

@@ -9,7 +9,6 @@ import datetime
 import logging
 import select
 import socket
-import time
 from typing import Any, Callable, Dict
 
 import aprslib
@@ -25,6 +24,7 @@ from aprsd import (  # noqa
     exception,
 )
 from aprsd.packets import core
+from aprsd.utils import trace
 
 CONF = cfg.CONF
 LOG = logging.getLogger('APRSD')
@@ -46,10 +46,12 @@ def handle_fend(buffer: bytes, strip_df_start: bool = True) -> bytes:
     return bytes(frame)
 
 
-# class TCPKISSDriver(metaclass=trace.TraceWrapperMetaclass):
-class TCPKISSDriver:
+class TCPKISSDriver(metaclass=trace.TraceWrapperMetaclass):
+    # class TCPKISSDriver:
     """APRSD client driver for TCP KISS connections."""
 
+    _instance = None
+
     # Class level attributes required by Client protocol
     packets_received = 0
     packets_sent = 0
@@ -62,6 +64,12 @@ class TCPKISSDriver:
     select_timeout = 1
     path = None
 
+    def __new__(cls, *args, **kwargs):
+        """This magic turns this into a singleton."""
+        if cls._instance is None:
+            cls._instance = super().__new__(cls)
+        return cls._instance
+
     def __init__(self):
         """Initialize the KISS client.
 
@@ -71,7 +79,6 @@ class TCPKISSDriver:
         super().__init__()
         self._connected = False
         self.keepalive = datetime.datetime.now()
-        self._running = False
         # This is initialized in setup_connection()
         self.socket = None
 
@@ -111,7 +118,15 @@ class TCPKISSDriver:
 
     def close(self):
         """Close the connection."""
-        self.stop()
+        self._connected = False
+        if self.socket:
+            try:
+                self.socket.close()
+            except Exception as e:
+                LOG.error(f'close: error closing socket: {e}')
+                pass
+        else:
+            LOG.warning('close: socket not initialized. no reason to close.')
 
     def send(self, packet: core.Packet):
         """Send an APRS packet.
@@ -163,6 +178,10 @@ class TCPKISSDriver:
             LOG.error('KISS is not enabled in configuration')
             return
 
+        if self._connected:
+            LOG.warning('KISS interface already connected')
+            return
+
         try:
             # Configure for TCP KISS
             if self.is_enabled():
@@ -217,22 +236,18 @@ class TCPKISSDriver:
         Raises:
             Exception: If not connected to KISS TNC
         """
-        self._running = True
-        while self._running:
-            # Ensure connection
-            if not self._connected:
-                if not self.connect():
-                    time.sleep(1)
-                    continue
+        # Ensure connection
+        if not self._connected:
+            return
 
-            # Read frame
-            frame = self.read_frame()
-            if frame:
-                LOG.warning(f'GOT FRAME: {frame} calling {callback}')
-                kwargs = {
-                    'frame': frame,
-                }
-                callback(**kwargs)
+        # Read frame
+        frame = self.read_frame()
+        if frame:
+            LOG.info(f'GOT FRAME: {frame} calling {callback}')
+            kwargs = {
+                'frame': frame,
+            }
+            callback(**kwargs)
 
     def decode_packet(self, *args, **kwargs) -> core.Packet:
         """Decode a packet from an AX.25 frame.
@@ -245,7 +260,6 @@ class TCPKISSDriver:
             LOG.warning('No frame received to decode?!?!')
             return None
 
-        LOG.warning(f'FRAME: {str(frame)}')
         try:
             aprslib_frame = aprslib.parse(str(frame))
             packet = core.factory(aprslib_frame)
@@ -257,16 +271,6 @@ class TCPKISSDriver:
             LOG.error(f'Error decoding packet: {e}')
             return None
 
-    def stop(self):
-        """Stop the KISS interface."""
-        self._running = False
-        self._connected = False
-        if self.socket:
-            try:
-                self.socket.close()
-            except Exception:
-                pass
-
     def stats(self, serializable: bool = False) -> Dict[str, Any]:
         """Get client statistics.
 
@@ -353,13 +357,19 @@ class TCPKISSDriver:
         """
         Generator for complete lines, received from the server
         """
+        if not self.socket:
+            return None
+
+        if not self._connected:
+            return None
+
         try:
             self.socket.setblocking(0)
         except OSError as e:
             LOG.error(f'socket error when setblocking(0): {str(e)}')
             raise aprslib.ConnectionDrop('connection dropped') from e
 
-        while self._running:
+        while self._connected:
             short_buf = b''
 
             try:
@@ -375,14 +385,14 @@ class TCPKISSDriver:
                     else:
                         continue
             except Exception as e:
+                # No need to log if we are not running.
+                # this happens when the client is stopped/closed.
                 LOG.error(f'Error in read loop: {e}')
                 self._connected = False
                 break
 
             try:
-                print('reading from socket')
                 short_buf = self.socket.recv(1024)
-                print(f'short_buf: {short_buf}')
                 # sock.recv returns empty if the connection drops
                 if not short_buf:
                     if not blocking:

aprsd/main.py

@@ -72,6 +72,7 @@ def main():
 
 def signal_handler(sig, frame):
     click.echo('signal_handler: called')
+    collector.Collector().stop_all()
     threads.APRSDThreadList().stop_all()
     if 'subprocess' not in str(frame):
         LOG.info(

aprsd/stats/collector.py

@@ -44,3 +44,9 @@ class Collector:
         if not isinstance(producer_name, StatsProducer):
             raise TypeError(f'Producer {producer_name} is not a StatsProducer')
         self.producers.remove(producer_name)
+
+    def stop_all(self):
+        """Stop and unregister all registered stats producers."""
+        for producer in self.producers[:]:
+            LOG.info(f'Stopping Stats producer {producer}')
+            self.unregister_producer(producer)

aprsd/utils/trace.py

@@ -5,11 +5,11 @@ import logging
 import time
 import types
 
-VALID_TRACE_FLAGS = {"method", "api"}
+VALID_TRACE_FLAGS = {'method', 'api'}
 TRACE_API = False
 TRACE_METHOD = False
 TRACE_ENABLED = False
-LOG = logging.getLogger("APRSD")
+LOG = logging.getLogger('APRSD')
 
 
 def trace(*dec_args, **dec_kwargs):
@@ -27,11 +27,12 @@ def trace(*dec_args, **dec_kwargs):
 
     def _decorator(f):
         func_name = f.__qualname__
-        func_file = "/".join(f.__code__.co_filename.split("/")[-4:])
+        func_file = '/'.join(f.__code__.co_filename.split('/')[-4:])
+        func_line_number = f.__code__.co_firstlineno
 
         @functools.wraps(f)
         def trace_logging_wrapper(*args, **kwargs):
-            filter_function = dec_kwargs.get("filter_function")
+            filter_function = dec_kwargs.get('filter_function')
             logger = LOG
 
             # NOTE(ameade): Don't bother going any further if DEBUG log level
@@ -40,16 +41,16 @@ def trace(*dec_args, **dec_kwargs):
                 return f(*args, **kwargs)
 
             all_args = inspect.getcallargs(f, *args, **kwargs)
-
             pass_filter = filter_function is None or filter_function(all_args)
 
             if pass_filter:
                 logger.debug(
-                    "==> %(func)s: call %(all_args)r file: %(file)s",
+                    '==> %(func)s: call %(all_args)r file: %(file)s:%(line_number)d',
                     {
-                        "func": func_name,
-                        "all_args": str(all_args),
-                        "file": func_file,
+                        'func': func_name,
+                        'all_args': str(all_args),
+                        'file': func_file,
+                        'line_number': func_line_number,
                     },
                 )
 
@@ -59,11 +60,11 @@ def trace(*dec_args, **dec_kwargs):
             except Exception as exc:
                 total_time = int(round(time.time() * 1000)) - start_time
                 logger.debug(
-                    "<== %(func)s: exception (%(time)dms) %(exc)r",
+                    '<== %(func)s: exception (%(time)dms) %(exc)r',
                     {
-                        "func": func_name,
-                        "time": total_time,
-                        "exc": exc,
+                        'func': func_name,
+                        'time': total_time,
+                        'exc': exc,
                     },
                 )
                 raise
@@ -78,11 +79,11 @@ def trace(*dec_args, **dec_kwargs):
 
             if pass_filter:
                 logger.debug(
-                    "<== %(func)s: return (%(time)dms) %(result)r",
+                    '<== %(func)s: return (%(time)dms) %(result)r',
                     {
-                        "func": func_name,
-                        "time": total_time,
-                        "result": mask_result,
+                        'func': func_name,
+                        'time': total_time,
+                        'result': mask_result,
                     },
                 )
             return result
@@ -174,7 +175,7 @@ def setup_tracing(trace_flags):
     except TypeError:  # Handle when trace_flags is None or a test mock
         trace_flags = []
     for invalid_flag in set(trace_flags) - VALID_TRACE_FLAGS:
-        LOG.warning("Invalid trace flag: %s", invalid_flag)
-    TRACE_METHOD = "method" in trace_flags
-    TRACE_API = "api" in trace_flags
+        LOG.warning('Invalid trace flag: %s', invalid_flag)
+    TRACE_METHOD = 'method' in trace_flags
+    TRACE_API = 'api' in trace_flags
     TRACE_ENABLED = True

{aprsd-4.2.1.dist-info → aprsd-4.2.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aprsd
-Version: 4.2.1
+Version: 4.2.3
 Summary: APRSd is a APRS-IS server that can be used to connect to APRS-IS and send and receive APRS packets.
 Author-email: Craig Lamparter <craig@craiger.org>, "Walter A. Boring IV" <waboring@hemna.com>, Emre Saglam <emresaglam@gmail.com>, Jason Martin <jhmartin@toger.us>, John <johng42@users.noreply.github.com>, Martiros Shakhzadyan <vrzh@vrzh.net>, Zoe Moore <zoenb@mailbox.org>, ranguli <hello@joshmurphy.ca>
 Maintainer-email: Craig Lamparter <craig@craiger.org>, "Walter A. Boring IV" <waboring@hemna.com>

{aprsd-4.2.1.dist-info → aprsd-4.2.3.dist-info}/RECORD

@@ -1,17 +1,17 @@
 aprsd/__init__.py,sha256=ci_49KK2a4GXyxcM2lFZfNAOsBfXzh0yayIGQazw56I,687
 aprsd/cli_helper.py,sha256=mKHww_cStwFBThjntFylrSnF6n9jOPHlR8r9SsrCxdY,4605
 aprsd/exception.py,sha256=bzln7sP9USQ67tz5nQh6e4KMaS8X2uhPJMNVmCkKV30,679
-aprsd/main.py,sha256=sOzG4tKtm7FGxwvYWIwiPujzo5TV3F0cSkR7IWHlb8M,4719
+aprsd/main.py,sha256=JDI8VUGvi8KSG4hH125OlvdXC4xtwyakU0cB2YHpTXA,4756
 aprsd/plugin.py,sha256=pdyvKhSugFo4vRy7VflnaZ-BKozGa3GTTAHErskW3WU,17848
 aprsd/plugin_utils.py,sha256=beXQ1n_YI38rqDwswtE8NjFwFzjpaeve9W_JotX1n1A,2544
 aprsd/client/__init__.py,sha256=lh7mKBoSo2Tt82QoqlAARGm4LY6ffsn7d8x6M4B7n9g,154
-aprsd/client/client.py,sha256=7Y79BDaD0S28lziTgD6xl9C4f6rRrOgLJXNx_c__Wa8,4430
+aprsd/client/client.py,sha256=sTZaxduDyGYtBpxpOvYAGG6D6gz6CPsivou9eKnW0tw,4898
 aprsd/client/stats.py,sha256=dUqRZao04B2TTj9TGMSygdLHa3if3pEy86eK-fK4sj4,353
 aprsd/client/drivers/__init__.py,sha256=IWSSrAEMrJQzulCIAx-N7Du0HK9sQOXIh98aJRCtfdg,421
-aprsd/client/drivers/aprsis.py,sha256=8VhKjnfAfxaXdBLKvC4guTU2WQsdHAvIogoxHX57gxc,6651
-aprsd/client/drivers/fake.py,sha256=b3q9-4O9Gtd7XnEzgZ2NzR5Zv6szxKBe07nsXJXmSHw,3249
-aprsd/client/drivers/registry.py,sha256=AWDWqxjOYHDz8ow4fNSSJ7JR6Tgy1axG6r0I9Yk2nJ8,2213
-aprsd/client/drivers/tcpkiss.py,sha256=cjdVL88aeOst7tlxZ15ti5EBJNiXqvWHWFVrZMrk23Y,13527
+aprsd/client/drivers/aprsis.py,sha256=DLtNgj1YAOiaHiALfHD6W-QF6JkzgQdmL7BmPXOa7KA,6763
+aprsd/client/drivers/fake.py,sha256=iCe7zRJxL3giADSX6PMNMcasr9g4GpPNFSGhrKlgCeg,3277
+aprsd/client/drivers/registry.py,sha256=vTKYTGAnVdBAyvCL51BadGFMNBsibzr9-xLPfXm_a9U,2227
+aprsd/client/drivers/tcpkiss.py,sha256=begkOCkrd1g5JpuPGgY-EMiy3NcMxZaHaaWZqoCIQ5w,13817
 aprsd/client/drivers/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 aprsd/client/drivers/lib/aprslib.py,sha256=9KTEKlivGT1f1js-u-w1WNLhOs1kQxkr3COa1CI95oE,9439
 aprsd/cmds/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -52,7 +52,7 @@ aprsd/plugins/version.py,sha256=NAPFKQ0lQqgjoDyTVy8tZcRGmdcJE_ZogRElDz27V2U,839
 aprsd/plugins/weather.py,sha256=XOspEoAumUb35TW2RYqjRV0lp6hrR_kOMIT41iEUGQQ,13399
 aprsd/stats/__init__.py,sha256=ltAtUiEvpokBEtOpq0sxpDGOLQT2evgeZSVBzDzjkSo,808
 aprsd/stats/app.py,sha256=axqMA137zKqU03yO8XI5f1QE8ajmr9YK0J9O9m4iSzo,1378
-aprsd/stats/collector.py,sha256=7nx_KSP_PUeuX5q8xJhsB9G_JfgQFCAvrPNzO7uK4FM,1502
+aprsd/stats/collector.py,sha256=hIwJyw7P457NduqEzP0FPHEzf_HOuXepsBRmxiSCKKs,1743
 aprsd/threads/__init__.py,sha256=KPqAOhS4q995NCEWDnPCHiuu3guyuMZlyDUGx_h50z8,259
 aprsd/threads/aprsd.py,sha256=13AS7jAhcQBmTervBiADaC1Ins9C-6TrMDYjW1fQJkg,4794
 aprsd/threads/keepalive.py,sha256=E48_erNnqik5AAllMGx5gexAwPIaznCp0HCG45NltFw,3939
@@ -69,11 +69,11 @@ aprsd/utils/keepalive_collector.py,sha256=r0oKCpKPGsivOKTQkTfwcJRESqMfbNawCyqrcH
 aprsd/utils/objectstore.py,sha256=0OivUeagncWGH7eWjTwZhauf-etweTabp8Oykt0hoF4,3541
 aprsd/utils/package.py,sha256=BtyIT6F5tPTFIATy5zDtYnB2k-rSFey5K2t9RPGenck,5025
 aprsd/utils/ring_buffer.py,sha256=lWWuw7lEbc2URhqAJfRLjpXBDLiK6UUWzk3j2VFnERQ,1111
-aprsd/utils/trace.py,sha256=lIuDZHOjvWbL2IMJ2tN_XW4Ch8oe4uQ7uLGylUByli0,5687
-aprsd-4.2.1.dist-info/licenses/AUTHORS,sha256=fGZhgXFMCfDPbp0hHllwmPyfiKPobLNA3sJA3BMIJVE,22
-aprsd-4.2.1.dist-info/licenses/LICENSE,sha256=CeipvOyAZxBGUsFoaFqwkx54aPnIKEtm9a5u2uXxEws,10142
-aprsd-4.2.1.dist-info/METADATA,sha256=TKX8daOdMLu42sayX71q88zaAZfCBy_e3gyjsBOsBeg,45583
-aprsd-4.2.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-aprsd-4.2.1.dist-info/entry_points.txt,sha256=4fReoJUB-bFqOUK6eeXYYCvTdVLprL7KVH0hWQRP9eM,171
-aprsd-4.2.1.dist-info/top_level.txt,sha256=v1O96niUcJOTMh9aQnFRknbScJ6mMOwqurdbxeaeSjs,6
-aprsd-4.2.1.dist-info/RECORD,,
+aprsd/utils/trace.py,sha256=3W4V14qg63x39l77H7iaCEacXd_otvz3oJKwbKqH_jM,5812
+aprsd-4.2.3.dist-info/licenses/AUTHORS,sha256=fGZhgXFMCfDPbp0hHllwmPyfiKPobLNA3sJA3BMIJVE,22
+aprsd-4.2.3.dist-info/licenses/LICENSE,sha256=CeipvOyAZxBGUsFoaFqwkx54aPnIKEtm9a5u2uXxEws,10142
+aprsd-4.2.3.dist-info/METADATA,sha256=PJmJ8nucsHVSdnJRPggmAhLIiKHqJWC0hLyEYiN6NHU,45583
+aprsd-4.2.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+aprsd-4.2.3.dist-info/entry_points.txt,sha256=4fReoJUB-bFqOUK6eeXYYCvTdVLprL7KVH0hWQRP9eM,171
+aprsd-4.2.3.dist-info/top_level.txt,sha256=v1O96niUcJOTMh9aQnFRknbScJ6mMOwqurdbxeaeSjs,6
+aprsd-4.2.3.dist-info/RECORD,,