From 7e27a6e37d8e8c048ba768e800d83b6510bc456a Mon Sep 17 00:00:00 2001 From: Jack Robison Date: Wed, 7 Nov 2018 16:12:11 -0500 Subject: [PATCH] fix --- lbrynet/__init__.py | 3 +++ lbrynet/log_support.py | 4 ---- tests/functional/dht/test_store.py | 2 +- tests/functional/test_reflector.py | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/lbrynet/__init__.py b/lbrynet/__init__.py index d4afab105..58a08780a 100644 --- a/lbrynet/__init__.py +++ b/lbrynet/__init__.py @@ -1,7 +1,10 @@ import logging +from lbrynet.custom_logger import install_logger + __name__ = "lbrynet" __version__ = "0.30.1rc1" version = tuple(__version__.split('.')) +install_logger() logging.getLogger(__name__).addHandler(logging.NullHandler()) diff --git a/lbrynet/log_support.py b/lbrynet/log_support.py index 06ab68ead..2b2803f5b 100644 --- a/lbrynet/log_support.py +++ b/lbrynet/log_support.py @@ -8,7 +8,6 @@ import twisted.python.log from twisted.internet import defer from lbrynet import __version__ as lbrynet_version, build_type from lbrynet import utils, conf -from lbrynet.custom_logger import install_logger class HTTPSHandler(logging.Handler): @@ -212,9 +211,6 @@ def configure_logging(file_name, console, verbose=None): verbose: a list of loggers to set to debug level. See `convert_verbose` for more details. """ - logger = logging.getLoggerClass() - if not hasattr(logger, "fail"): - install_logger() verbose = convert_verbose(verbose) configure_twisted() configure_file_handler(file_name) diff --git a/tests/functional/dht/test_store.py b/tests/functional/dht/test_store.py index f3e81b332..b45eef3d7 100644 --- a/tests/functional/dht/test_store.py +++ b/tests/functional/dht/test_store.py @@ -3,7 +3,7 @@ from binascii import hexlify from twisted.internet import defer from lbrynet.dht import constants -from lbrynet.p2p.utils import generate_id +from lbrynet.utils import generate_id from .dht_test_environment import TestKademliaBase import logging diff --git a/tests/functional/test_reflector.py b/tests/functional/test_reflector.py index bac25c3a4..5b9cfc116 100644 --- a/tests/functional/test_reflector.py +++ b/tests/functional/test_reflector.py @@ -26,7 +26,7 @@ class TestReflector(unittest.TestCase): self.client_db_dir, self.client_blob_dir = mk_db_and_blob_dir() prm = OnlyFreePaymentsManager() wallet = mocks.Wallet() - peer_manager = PeerManager.PeerManager() + peer_manager = PeerManager() peer_finder = mocks.PeerFinder(5553, peer_manager, 2) self.server_storage = SQLiteStorage(self.server_db_dir) self.server_blob_manager = BlobManager.DiskBlobManager(self.server_blob_dir, self.server_storage)