From 4e7e475a5ea5b2f640e41bc635e60bb460dce00d Mon Sep 17 00:00:00 2001 From: Lex Berezhny Date: Fri, 18 Oct 2019 10:23:35 -0400 Subject: [PATCH] minor fixups for logging --- lbry/lbry/extras/cli.py | 36 ++++++++++++++++++------------------ lbry/tests/unit/test_cli.py | 34 ++++++++++++++++------------------ 2 files changed, 34 insertions(+), 36 deletions(-) diff --git a/lbry/lbry/extras/cli.py b/lbry/lbry/extras/cli.py index 3d3e3f436..07b2298a0 100644 --- a/lbry/lbry/extras/cli.py +++ b/lbry/lbry/extras/cli.py @@ -220,46 +220,46 @@ def ensure_directory_exists(path: str): pathlib.Path(path).mkdir(parents=True, exist_ok=True) -def setup_logging(args: argparse.Namespace, conf: Config, loop: asyncio.AbstractEventLoop, - root_logger: logging.Logger): +LOG_MODULES = ('lbry', 'torba', 'aioupnp') + + +def setup_logging(args: argparse.Namespace, conf: Config, logger: logging.Logger): default_formatter = logging.Formatter("%(asctime)s %(levelname)-8s %(name)s:%(lineno)d: %(message)s") file_handler = logging.handlers.RotatingFileHandler( conf.log_file_path, maxBytes=2097152, backupCount=5 ) file_handler.setFormatter(default_formatter) - root_logger.getChild('lbry').addHandler(file_handler) - root_logger.getChild('lbry').addHandler(logging.NullHandler()) - root_logger.getChild('torba').addHandler(file_handler) - + for module_name in LOG_MODULES: + logger.getChild(module_name).addHandler(file_handler) if not args.quiet: handler = logging.StreamHandler() handler.setFormatter(default_formatter) - root_logger.getChild('lbry').addHandler(handler) - root_logger.getChild('torba').addHandler(handler) - root_logger.getChild('torba').setLevel(logging.INFO) + for module_name in LOG_MODULES: + logger.getChild(module_name).addHandler(handler) - root_logger.getChild('aioupnp').setLevel(logging.WARNING) - root_logger.getChild('aiohttp').setLevel(logging.CRITICAL) + logger.getChild('lbry').setLevel(logging.INFO) + logger.getChild('torba').setLevel(logging.INFO) + logger.getChild('aioupnp').setLevel(logging.WARNING) + logger.getChild('aiohttp').setLevel(logging.CRITICAL) - root_logger.getChild('lbry').setLevel(logging.INFO) if args.verbose is not None: - loop.set_debug(True) if len(args.verbose) > 0: for module in args.verbose: - root_logger.getChild(module).setLevel(logging.DEBUG) + logger.getChild(module).setLevel(logging.DEBUG) else: - root_logger.getChild('lbry').setLevel(logging.DEBUG) + logger.getChild('lbry').setLevel(logging.DEBUG) if conf.share_usage_data: loggly_handler = get_loggly_handler() loggly_handler.setLevel(logging.ERROR) - root_logger.getChild('lbry').addHandler(loggly_handler) + logger.getChild('lbry').addHandler(loggly_handler) def run_daemon(args: argparse.Namespace, conf: Config): loop = asyncio.get_event_loop() - root_logger = logging.getLogger() - setup_logging(args, conf, loop, root_logger) + if args.verbose is not None: + loop.set_debug(True) + setup_logging(args, conf, logging.getLogger()) daemon = Daemon(conf) def __exit(): diff --git a/lbry/tests/unit/test_cli.py b/lbry/tests/unit/test_cli.py index e7e58111a..7a4cb54e8 100644 --- a/lbry/tests/unit/test_cli.py +++ b/lbry/tests/unit/test_cli.py @@ -1,6 +1,4 @@ import contextlib -import asyncio -import importlib import logging from io import StringIO from unittest import TestCase @@ -15,35 +13,35 @@ from lbry.conf import Config from lbry.extras import cli -class CLILoggingTest(TestCase): +class CLILoggingTest(AsyncioTestCase): + + async def test_setup_logging(self): + # test needs to be async to avoid warnings from loggly - def test_setup_logging(self): def setup(argv): parser = cli.get_argument_parser() args, command_args = parser.parse_known_args(argv) conf = Config.create_from_arguments(args) conf.data_dir = '/tmp' - setup_logging(args, conf, test_loop, root_logger) + setup_logging(args, conf, logger) - test_loop = asyncio.new_event_loop() - asyncio.set_event_loop(test_loop) - root_logger = logging.getLogger('test_logger') + logger = logging.getLogger('test_logger') setup(["start"]) - self.assertTrue(root_logger.getChild("lbry").isEnabledFor(logging.INFO)) - self.assertFalse(root_logger.getChild("lbry").isEnabledFor(logging.DEBUG)) + self.assertTrue(logger.getChild("lbry").isEnabledFor(logging.INFO)) + self.assertFalse(logger.getChild("lbry").isEnabledFor(logging.DEBUG)) setup(["start", "--verbose"]) - self.assertTrue(root_logger.getChild("lbry").isEnabledFor(logging.DEBUG)) - self.assertTrue(root_logger.getChild("lbry").isEnabledFor(logging.INFO)) - self.assertFalse(root_logger.getChild("torba").isEnabledFor(logging.DEBUG)) + self.assertTrue(logger.getChild("lbry").isEnabledFor(logging.DEBUG)) + self.assertTrue(logger.getChild("lbry").isEnabledFor(logging.INFO)) + self.assertFalse(logger.getChild("torba").isEnabledFor(logging.DEBUG)) setup(["start", "--verbose", "lbry.extras", "lbry.wallet", "torba.client"]) - self.assertTrue(root_logger.getChild("lbry.extras").isEnabledFor(logging.DEBUG)) - self.assertTrue(root_logger.getChild("lbry.wallet").isEnabledFor(logging.DEBUG)) - self.assertTrue(root_logger.getChild("torba.client").isEnabledFor(logging.DEBUG)) - self.assertFalse(root_logger.getChild("lbry").isEnabledFor(logging.DEBUG)) - self.assertFalse(root_logger.getChild("torba").isEnabledFor(logging.DEBUG)) + self.assertTrue(logger.getChild("lbry.extras").isEnabledFor(logging.DEBUG)) + self.assertTrue(logger.getChild("lbry.wallet").isEnabledFor(logging.DEBUG)) + self.assertTrue(logger.getChild("torba.client").isEnabledFor(logging.DEBUG)) + self.assertFalse(logger.getChild("lbry").isEnabledFor(logging.DEBUG)) + self.assertFalse(logger.getChild("torba").isEnabledFor(logging.DEBUG)) class CLITest(AsyncioTestCase):