hemna/aprsd
1
0
Fork 0
mirror of https://github.com/craigerl/aprsd.git synced 2025-09-04 22:27:50 -04:00
Code Issues Projects Releases Wiki Activity

Moved log.py to logging

Browse Source 
Also renamed logging/logging.py to logging/rich.py
This commit is contained in:
Hemna 2022-07-07 11:02:43 -04:00
parent a62843920a
commit 1ccb2f7695
6 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
aprsd/cli_helper.py
View File

@ -4,7 +4,7 @@ import typing as t
import click import click
from aprsd import config as aprsd_config from aprsd import config as aprsd_config
from aprsd import log from aprsd.logging import log
F = t.TypeVar("F", bound=t.Callable[..., t.Any]) F = t.TypeVar("F", bound=t.Callable[..., t.Any])

5
aprsd/flask.py
View File

@ -18,9 +18,10 @@ from werkzeug.security import check_password_hash, generate_password_hash
import aprsd import aprsd
from aprsd import client from aprsd import client
from aprsd import config as aprsd_config from aprsd import config as aprsd_config
from aprsd import log, messaging, packets, plugin, stats, threads, utils from aprsd import messaging, packets, plugin, stats, threads, utils
from aprsd.clients import aprsis from aprsd.clients import aprsis
from aprsd.logging import logging as aprsd_logging from aprsd.logging import log
from aprsd.logging import rich as aprsd_logging
LOG = logging.getLogger("APRSD") LOG = logging.getLogger("APRSD")

2
aprsd/log.py → aprsd/logging/log.py
View File

@ -5,7 +5,7 @@ import queue
import sys import sys
from aprsd import config as aprsd_config from aprsd import config as aprsd_config
from aprsd.logging import logging as aprsd_logging from aprsd.logging import rich as aprsd_logging
LOG = logging.getLogger("APRSD") LOG = logging.getLogger("APRSD")

0
aprsd/logging/logging.py → aprsd/logging/rich.py
View File

4
tests/cmds/test_dev.py
View File

@ -25,7 +25,7 @@ class TestDevTestPluginCommand(unittest.TestCase):
return aprsd_config.Config(config) return aprsd_config.Config(config)
@mock.patch("aprsd.config.parse_config") @mock.patch("aprsd.config.parse_config")
@mock.patch("aprsd.log.setup_logging") @mock.patch("aprsd.logging.log.setup_logging")
def test_no_login(self, mock_logging, mock_parse_config): def test_no_login(self, mock_logging, mock_parse_config):
"""Make sure we get an error if there is no login and config.""" """Make sure we get an error if there is no login and config."""
@ -43,7 +43,7 @@ class TestDevTestPluginCommand(unittest.TestCase):
assert "Must set --aprs_login or APRS_LOGIN" in result.output assert "Must set --aprs_login or APRS_LOGIN" in result.output
@mock.patch("aprsd.config.parse_config") @mock.patch("aprsd.config.parse_config")
@mock.patch("aprsd.log.setup_logging") @mock.patch("aprsd.logging.log.setup_logging")
def test_no_plugin_arg(self, mock_logging, mock_parse_config): def test_no_plugin_arg(self, mock_logging, mock_parse_config):
"""Make sure we get an error if there is no login and config.""" """Make sure we get an error if there is no login and config."""

8
tests/cmds/test_send_message.py
View File

@ -25,7 +25,7 @@ class TestSendMessageCommand(unittest.TestCase):
return aprsd_config.Config(config) return aprsd_config.Config(config)
@mock.patch("aprsd.config.parse_config") @mock.patch("aprsd.config.parse_config")
@mock.patch("aprsd.log.setup_logging") @mock.patch("aprsd.logging.log.setup_logging")
def test_no_login(self, mock_logging, mock_parse_config): def test_no_login(self, mock_logging, mock_parse_config):
"""Make sure we get an error if there is no login and config.""" """Make sure we get an error if there is no login and config."""
@ -43,7 +43,7 @@ class TestSendMessageCommand(unittest.TestCase):
assert "Must set --aprs_login or APRS_LOGIN" in result.output assert "Must set --aprs_login or APRS_LOGIN" in result.output
@mock.patch("aprsd.config.parse_config") @mock.patch("aprsd.config.parse_config")
@mock.patch("aprsd.log.setup_logging") @mock.patch("aprsd.logging.log.setup_logging")
def test_no_password(self, mock_logging, mock_parse_config): def test_no_password(self, mock_logging, mock_parse_config):
"""Make sure we get an error if there is no password and config.""" """Make sure we get an error if there is no password and config."""
@ -58,7 +58,7 @@ class TestSendMessageCommand(unittest.TestCase):
assert "Must set --aprs-password or APRS_PASSWORD" in result.output assert "Must set --aprs-password or APRS_PASSWORD" in result.output
@mock.patch("aprsd.config.parse_config") @mock.patch("aprsd.config.parse_config")
@mock.patch("aprsd.log.setup_logging") @mock.patch("aprsd.logging.log.setup_logging")
def test_no_tocallsign(self, mock_logging, mock_parse_config): def test_no_tocallsign(self, mock_logging, mock_parse_config):
"""Make sure we get an error if there is no tocallsign.""" """Make sure we get an error if there is no tocallsign."""
@ -76,7 +76,7 @@ class TestSendMessageCommand(unittest.TestCase):
assert "Error: Missing argument 'TOCALLSIGN'" in result.output assert "Error: Missing argument 'TOCALLSIGN'" in result.output
@mock.patch("aprsd.config.parse_config") @mock.patch("aprsd.config.parse_config")
@mock.patch("aprsd.log.setup_logging") @mock.patch("aprsd.logging.log.setup_logging")
def test_no_command(self, mock_logging, mock_parse_config): def test_no_command(self, mock_logging, mock_parse_config):
"""Make sure we get an error if there is no command.""" """Make sure we get an error if there is no command."""