aprsd 3.3.0__py2.py3-none-any.whl → 3.3.1__py2.py3-none-any.whl

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/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/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.dist-info → aprsd-3.3.1.dist-info}/METADATA

@@ -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.dist-info → aprsd-3.3.1.dist-info}/RECORD

@@ -1,5 +1,5 @@
 aprsd/__init__.py,sha256=GiMknvhvMBWeMsJXiBS8slVBJdwX9h3FjnXqGjm8YZM,631
-aprsd/cli_helper.py,sha256=Ny0Uee7xIjfI0fBQ-OTUbpeqpM9YdizDW8mGn7YHW6Q,4577
+aprsd/cli_helper.py,sha256=AgSSn6oTUdCDv4Ne1Jyg_0bi7GwINBBKotTLk_QE-cY,4568
 aprsd/client.py,sha256=7NI_xFUoPaAyVHMIogpedZjWhMZaK5ZYEQWsk9aAukQ,10072
 aprsd/exception.py,sha256=FyeehwYENwsRKyrU2WmgEPmcHsDLjdGRAe35f01Bu5A,502
 aprsd/main.py,sha256=E78yXv6qPvzxatYF7fz5epWAYf8YpRJpt7sR9malhY0,4567
@@ -15,7 +15,7 @@ aprsd/clients/kiss.py,sha256=Cc26CbgDaJ9WfGfIHOhfTn7XdDnYWLLv85Xj4oD2_6U,3393
 aprsd/cmds/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 aprsd/cmds/completion.py,sha256=4gTd6QLs97qZARraSEgAjudthdSGURecjjmC6JZtXXk,1763
 aprsd/cmds/dev.py,sha256=ob5vKomigQdHuFt7aWU0YLaeXKsWbm3dqyYTf0qztIc,4369
-aprsd/cmds/fetch_stats.py,sha256=O-XrsqiLg1DAdBHqM8-SzK1v4weTdrzPqmRztFNH1hg,5348
+aprsd/cmds/fetch_stats.py,sha256=BgQcuDHLp7XiKGBFv_CI0RqqZTdvZMjG7bwl_Vm3UKs,5489
 aprsd/cmds/healthcheck.py,sha256=HhCFnaWNlyGbYiBZx_1APh4v36t8CUNGyi41mdcuSDg,2801
 aprsd/cmds/list_plugins.py,sha256=wGBEjINDDmvvW8wdiyuh7HsTUKxl69vxCvcDmgfyzRE,10667
 aprsd/cmds/listen.py,sha256=ndrQct8Vo1zrTS2Dh4FYD8TEhAsIjPnQZIyaQUHPum0,6241
@@ -30,7 +30,7 @@ aprsd/conf/opts.py,sha256=Jq1DPyDdNyN2rbuHq8O-lF2Entkb9tFTbh9gjZwWC5s,2701
 aprsd/conf/plugin_common.py,sha256=HKNV2JKCJOPUqTdoFgc96mGNZLU6zNii2syjuJj8tAo,6253
 aprsd/conf/plugin_email.py,sha256=IB8G_vTCC-6HVGx9y1PP2vKXfXRzlEx9lEFXdIIGHzA,2332
 aprsd/log/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-aprsd/log/log.py,sha256=cFJkPBk_0OdpUBC5m5bKnHkWWz4PPYwk212z4U2qARI,3224
+aprsd/log/log.py,sha256=Lytim2gK7gm3VoMDqJkXS1s28lXuahz2vX1Z7cvn_zw,2698
 aprsd/packets/__init__.py,sha256=h3cq6MCjvztM2GBeHagay0chEcJWKophT22PLktGYzg,434
 aprsd/packets/core.py,sha256=I5ajk1EJoNPpOjndTG9kddaV8Y3x_gdxoa7TqOWwGCo,22655
 aprsd/packets/packet_list.py,sha256=CeDD9uV3YTnnXmH52rdAkN4AswY8A710fQ2NSLicCcw,2444
@@ -122,10 +122,10 @@ aprsd/web/chat/static/js/upstream/socket.io.min.js,sha256=dYF5MG5zs6ekpbIOXBXelJ
 aprsd/web/chat/static/json-viewer/jquery.json-viewer.css,sha256=rXfxviikI1RGZM3px6piq9ZL0YZuO5ETcO8-toY-DDY,1080
 aprsd/web/chat/static/json-viewer/jquery.json-viewer.js,sha256=klSHtWPkZv4zG4darvDEpAQ9hJFDqNbQrM-xDChm8Fo,5020
 aprsd/web/chat/templates/index.html,sha256=vxa0VV3ZIGfv8x1VwCeamJhdyNQ1QpsU_tNHoIrBTXs,6566
-aprsd-3.3.0.dist-info/LICENSE,sha256=CeipvOyAZxBGUsFoaFqwkx54aPnIKEtm9a5u2uXxEws,10142
-aprsd-3.3.0.dist-info/METADATA,sha256=j7WW7gOdze-phHDQff6dlJBUxo1qx7pdPAA4u6dgCQs,24038
-aprsd-3.3.0.dist-info/WHEEL,sha256=-G_t0oGuE7UD0DrSpVZnq1hHMBV9DD2XkS5v7XpmTnk,110
-aprsd-3.3.0.dist-info/entry_points.txt,sha256=4fReoJUB-bFqOUK6eeXYYCvTdVLprL7KVH0hWQRP9eM,171
-aprsd-3.3.0.dist-info/pbr.json,sha256=_AkUEXups6EgJua9OxmM1fEsYKH1CPspOdqsDtm2xQs,46
-aprsd-3.3.0.dist-info/top_level.txt,sha256=v1O96niUcJOTMh9aQnFRknbScJ6mMOwqurdbxeaeSjs,6
-aprsd-3.3.0.dist-info/RECORD,,
+aprsd-3.3.1.dist-info/LICENSE,sha256=CeipvOyAZxBGUsFoaFqwkx54aPnIKEtm9a5u2uXxEws,10142
+aprsd-3.3.1.dist-info/METADATA,sha256=NqiTMT3tadixMg96jfaI2erlBKSCnV-nqI8-76wM5cI,24038
+aprsd-3.3.1.dist-info/WHEEL,sha256=-G_t0oGuE7UD0DrSpVZnq1hHMBV9DD2XkS5v7XpmTnk,110
+aprsd-3.3.1.dist-info/entry_points.txt,sha256=4fReoJUB-bFqOUK6eeXYYCvTdVLprL7KVH0hWQRP9eM,171
+aprsd-3.3.1.dist-info/pbr.json,sha256=IQnKA75aOp451NIXVUhswWOZlCWPrOsdsdwJVaUKe04,46
+aprsd-3.3.1.dist-info/top_level.txt,sha256=v1O96niUcJOTMh9aQnFRknbScJ6mMOwqurdbxeaeSjs,6
+aprsd-3.3.1.dist-info/RECORD,,

aprsd-3.3.1.dist-info/pbr.json

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

aprsd-3.3.0.dist-info/pbr.json

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