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

aprsd/cmds/listen.py

@@ -17,7 +17,7 @@ from rich.console import Console
 # local imports here
 import aprsd
 from aprsd import cli_helper, packets, plugin, threads, utils
-from aprsd.client import client_factory
+from aprsd.client.client import APRSDClient
 from aprsd.main import cli
 from aprsd.packets import collector as packet_collector
 from aprsd.packets import core, seen_list
@@ -221,7 +221,9 @@ def listen(
     # CONF.aprs_network.login = aprs_login
     # config["aprs"]["password"] = aprs_password
 
+    LOG.info(f'Python version: {sys.version}')
     LOG.info(f'APRSD Listen Started version: {aprsd.__version__}')
+    utils.package.log_installed_extensions_and_plugins()
 
     CONF.log_opt_values(LOG, logging.DEBUG)
     collector.Collector()
@@ -232,13 +234,13 @@ def listen(
     # Initialize the client factory and create
     # The correct client object ready for use
     # Make sure we have 1 client transport enabled
-    if not client_factory.is_client_enabled():
+    if not APRSDClient().is_enabled:
         LOG.error('No Clients are enabled in config.')
         sys.exit(-1)
 
     # Creates the client object
     LOG.info('Creating client connection')
-    aprs_client = client_factory.create()
+    aprs_client = APRSDClient()
     LOG.info(aprs_client)
     if not aprs_client.login_success:
         # We failed to login, will just quit!

aprsd/cmds/send_message.py

@@ -13,8 +13,9 @@ from aprsd import (
     cli_helper,
     conf,  # noqa : F401
     packets,
+    utils,
 )
-from aprsd.client import client_factory
+from aprsd.client.client import APRSDClient
 from aprsd.main import cli
 from aprsd.packets import collector
 from aprsd.packets import log as packet_log
@@ -89,7 +90,9 @@ def send_message(
         else:
             aprs_password = CONF.aprs_network.password
 
-    LOG.info(f'APRSD LISTEN Started version: {aprsd.__version__}')
+    LOG.info(f'Python version: {sys.version}')
+    LOG.info(f'APRSD SEND_MESSAGE Started version: {aprsd.__version__}')
+    utils.package.log_installed_extensions_and_plugins()
     if type(command) is tuple:
         command = ' '.join(command)
     if not quiet:
@@ -103,7 +106,7 @@ def send_message(
 
     def rx_packet(packet):
         global got_ack, got_response
-        cl = client_factory.create()
+        cl = APRSDClient()
         packet = cl.decode_packet(packet)
         collector.PacketCollector().rx(packet)
         packet_log.log(packet, tx=False)
@@ -131,7 +134,7 @@ def send_message(
                 sys.exit(0)
 
     try:
-        client_factory.create().client  # noqa: B018
+        APRSDClient().client  # noqa: B018
     except LoginError:
         sys.exit(-1)
 
@@ -163,7 +166,7 @@ def send_message(
         # This will register a packet consumer with aprslib
         # When new packets come in the consumer will process
         # the packet
-        aprs_client = client_factory.create().client
+        aprs_client = APRSDClient()
         aprs_client.consumer(rx_packet, raw=False)
     except aprslib.exceptions.ConnectionDrop:
         LOG.error('Connection dropped, reconnecting')

aprsd/cmds/server.py

@@ -8,7 +8,7 @@ from oslo_config import cfg
 import aprsd
 from aprsd import cli_helper, plugin, threads, utils
 from aprsd import main as aprsd_main
-from aprsd.client import client_factory
+from aprsd.client.client import APRSDClient
 from aprsd.main import cli
 from aprsd.packets import collector as packet_collector
 from aprsd.packets import seen_list
@@ -40,31 +40,27 @@ def server(ctx, flush):
 
     service_threads = service.ServiceThreads()
 
+    LOG.info(f'Python version: {sys.version}')
+    LOG.info(f'APRSD Started version: {aprsd.__version__}')
     level, msg = utils._check_version()
     if level:
         LOG.warning(msg)
     else:
         LOG.info(msg)
-    LOG.info(f'APRSD Started version: {aprsd.__version__}')
-
-    # Initialize the client factory and create
-    # The correct client object ready for use
-    if not client_factory.is_client_enabled():
-        LOG.error('No Clients are enabled in config.')
-        sys.exit(-1)
+    utils.package.log_installed_extensions_and_plugins()
 
     # Make sure we have 1 client transport enabled
-    if not client_factory.is_client_enabled():
+    if not APRSDClient().is_enabled:
         LOG.error('No Clients are enabled in config.')
         sys.exit(-1)
 
-    if not client_factory.is_client_configured():
+    if not APRSDClient().is_configured:
         LOG.error('APRS client is not properly configured in config file.')
         sys.exit(-1)
 
     # Creates the client object
     LOG.info('Creating client connection')
-    aprs_client = client_factory.create()
+    aprs_client = APRSDClient()
     LOG.info(aprs_client)
     if not aprs_client.login_success:
         # We failed to login, will just quit!

aprsd/conf/common.py

@@ -19,7 +19,7 @@ registry_group = cfg.OptGroup(
 aprsd_opts = [
     cfg.StrOpt(
         'callsign',
-        required=True,
+        default='NOCALL',
         help='Callsign to use for messages sent by APRSD',
     ),
     cfg.BoolOpt(
@@ -137,6 +137,12 @@ aprsd_opts = [
         help='Set this to False, to disable sending of ack packets. This will entirely stop'
         'APRSD from sending ack packets.',
     ),
+    cfg.BoolOpt(
+        'is_digipi',
+        default=False,
+        help='Set this to True, if APRSD is running on a Digipi.'
+        'This is useful for changing the behavior of APRSD to work with Digipi.',
+    ),
 ]
 
 watch_list_opts = [

aprsd/exception.py

@@ -13,3 +13,10 @@ class ConfigOptionBogusDefaultException(Exception):
             f"Config file option '{config_option}' needs to be "
             f"changed from provided default of '{default_fail}'"
         )
+
+
+class APRSClientNotConfiguredException(Exception):
+    """APRS client is not configured."""
+
+    def __init__(self):
+        self.message = 'APRS client is not configured.'

aprsd/log/log.py

@@ -85,7 +85,7 @@ def setup_logging(loglevel=None, quiet=False, custom_handler=None):
         logging.getLogger(name).propagate = name not in disable_list
 
     handlers = []
-    if CONF.logging.enable_console_stdout:
+    if CONF.logging.enable_console_stdout and not quiet:
         handlers.append(
             {
                 'sink': sys.stdout,

aprsd/main.py

@@ -23,7 +23,6 @@
 import datetime
 import importlib.metadata as imp
 import logging
-import signal
 import sys
 import time
 from importlib.metadata import version as metadata_version
@@ -41,7 +40,6 @@ from aprsd.stats import collector
 CONF = cfg.CONF
 LOG = logging.getLogger('APRSD')
 CONTEXT_SETTINGS = dict(help_option_names=['-h', '--help'])
-flask_enabled = False
 
 
 @click.group(cls=cli_helper.AliasedGroup, context_settings=CONTEXT_SETTINGS)
@@ -73,8 +71,6 @@ def main():
 
 
 def signal_handler(sig, frame):
-    global flask_enabled
-
     click.echo('signal_handler: called')
     threads.APRSDThreadList().stop_all()
     if 'subprocess' not in str(frame):
@@ -96,9 +92,6 @@ def signal_handler(sig, frame):
         # signal.signal(signal.SIGTERM, sys.exit(0))
         # sys.exit(0)
 
-    if flask_enabled:
-        signal.signal(signal.SIGTERM, sys.exit(0))
-
 
 @cli.command()
 @cli_helper.add_options(cli_helper.common_options)