aprsd 3.3.0__tar.gz → 3.3.1__tar.gz

{aprsd-3.3.0 → aprsd-3.3.1}/ChangeLog

@@ -1,6 +1,12 @@
 CHANGES
 =======
 
+v3.3.1
+------
+
+* Fixed failure with fetch-stats
+* Fixed problem with list-plugins
+
 v3.3.0
 ------
 

{aprsd-3.3.0 → aprsd-3.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aprsd
-Version: 3.3.0
+Version: 3.3.1
 Summary: Amateur radio APRS daemon which listens for messages and responds
 Home-page: http://aprsd.readthedocs.org
 Author: Craig Lamparter

{aprsd-3.3.0 → aprsd-3.3.1}/aprsd/cli_helper.py

@@ -1,8 +1,9 @@
-import click
 from functools import update_wrapper
 import logging
 from pathlib import Path
 import typing as t
+
+import click
 from oslo_config import cfg
 
 import aprsd
@@ -58,7 +59,7 @@ class AliasedGroup(click.Group):
         Copied from `click` and extended for `aliases`.
         """
         def decorator(f):
-            aliases = kwargs.pop('aliases', [])
+            aliases = kwargs.pop("aliases", [])
             cmd = click.decorators.command(*args, **kwargs)(f)
             self.add_command(cmd)
             for alias in aliases:
@@ -74,7 +75,7 @@ class AliasedGroup(click.Group):
         Copied from `click` and extended for `aliases`.
         """
         def decorator(f):
-            aliases = kwargs.pop('aliases', [])
+            aliases = kwargs.pop("aliases", [])
             cmd = click.decorators.group(*args, **kwargs)(f)
             self.add_command(cmd)
             for alias in aliases:
@@ -137,7 +138,7 @@ def process_standard_options_no_config(f: F) -> F:
         ctx.obj["loglevel"] = kwargs["loglevel"]
         ctx.obj["config_file"] = kwargs["config_file"]
         ctx.obj["quiet"] = kwargs["quiet"]
-        log.setup_logging_no_config(
+        log.setup_logging(
             ctx.obj["loglevel"],
             ctx.obj["quiet"],
         )

{aprsd-3.3.0 → aprsd-3.3.1}/aprsd/cmds/fetch_stats.py

@@ -58,7 +58,11 @@ def fetch_stats(ctx, host, port, magic_word):
     with console.status(msg):
         client = rpc_client.RPCClient(host, port, magic_word)
         stats = client.get_stats_dict()
-        console.print_json(data=stats)
+        if stats:
+            console.print_json(data=stats)
+        else:
+            LOG.error(f"Failed to fetch stats via RPC aprsd server at {host}:{port}")
+            return
     aprsd_title = (
         "APRSD "
         f"[bold cyan]v{stats['aprsd']['version']}[/] "

{aprsd-3.3.0 → aprsd-3.3.1}/aprsd/log/log.py

@@ -1,5 +1,4 @@
 import logging
-from logging import NullHandler
 from logging.handlers import QueueHandler
 import queue
 import sys
@@ -96,20 +95,3 @@ def setup_logging(loglevel=None, quiet=False):
 
     # configure loguru
     logger.configure(handlers=handlers)
-
-
-def setup_logging_no_config(loglevel, quiet):
-    log_level = conf.log.LOG_LEVELS[loglevel]
-    LOG.setLevel(log_level)
-    log_format = CONF.logging.logformat
-    date_format = CONF.logging.date_format
-    log_formatter = logging.Formatter(fmt=log_format, datefmt=date_format)
-    fh = NullHandler()
-
-    fh.setFormatter(log_formatter)
-    LOG.addHandler(fh)
-
-    if not quiet:
-        sh = logging.StreamHandler(sys.stdout)
-        sh.setFormatter(log_formatter)
-        LOG.addHandler(sh)

{aprsd-3.3.0 → aprsd-3.3.1}/aprsd.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aprsd
-Version: 3.3.0
+Version: 3.3.1
 Summary: Amateur radio APRS daemon which listens for messages and responds
 Home-page: http://aprsd.readthedocs.org
 Author: Craig Lamparter

aprsd-3.3.1/aprsd.egg-info/pbr.json

@@ -0,0 +1 @@
+{"git_version": "10d023d", "is_release": true}

aprsd-3.3.0/aprsd.egg-info/pbr.json

@@ -1 +0,0 @@
-{"git_version": "c37e1d5", "is_release": true}