This commit is contained in:
Jack Robison 2018-11-07 16:12:11 -05:00
parent b98621d7ea
commit 7e27a6e37d
No known key found for this signature in database
GPG key ID: DF25C68FE0239BB2
4 changed files with 5 additions and 6 deletions

View file

@ -1,7 +1,10 @@
import logging import logging
from lbrynet.custom_logger import install_logger
__name__ = "lbrynet" __name__ = "lbrynet"
__version__ = "0.30.1rc1" __version__ = "0.30.1rc1"
version = tuple(__version__.split('.')) version = tuple(__version__.split('.'))
install_logger()
logging.getLogger(__name__).addHandler(logging.NullHandler()) logging.getLogger(__name__).addHandler(logging.NullHandler())

View file

@ -8,7 +8,6 @@ import twisted.python.log
from twisted.internet import defer from twisted.internet import defer
from lbrynet import __version__ as lbrynet_version, build_type from lbrynet import __version__ as lbrynet_version, build_type
from lbrynet import utils, conf from lbrynet import utils, conf
from lbrynet.custom_logger import install_logger
class HTTPSHandler(logging.Handler): 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. verbose: a list of loggers to set to debug level.
See `convert_verbose` for more details. See `convert_verbose` for more details.
""" """
logger = logging.getLoggerClass()
if not hasattr(logger, "fail"):
install_logger()
verbose = convert_verbose(verbose) verbose = convert_verbose(verbose)
configure_twisted() configure_twisted()
configure_file_handler(file_name) configure_file_handler(file_name)

View file

@ -3,7 +3,7 @@ from binascii import hexlify
from twisted.internet import defer from twisted.internet import defer
from lbrynet.dht import constants from lbrynet.dht import constants
from lbrynet.p2p.utils import generate_id from lbrynet.utils import generate_id
from .dht_test_environment import TestKademliaBase from .dht_test_environment import TestKademliaBase
import logging import logging

View file

@ -26,7 +26,7 @@ class TestReflector(unittest.TestCase):
self.client_db_dir, self.client_blob_dir = mk_db_and_blob_dir() self.client_db_dir, self.client_blob_dir = mk_db_and_blob_dir()
prm = OnlyFreePaymentsManager() prm = OnlyFreePaymentsManager()
wallet = mocks.Wallet() wallet = mocks.Wallet()
peer_manager = PeerManager.PeerManager() peer_manager = PeerManager()
peer_finder = mocks.PeerFinder(5553, peer_manager, 2) peer_finder = mocks.PeerFinder(5553, peer_manager, 2)
self.server_storage = SQLiteStorage(self.server_db_dir) self.server_storage = SQLiteStorage(self.server_db_dir)
self.server_blob_manager = BlobManager.DiskBlobManager(self.server_blob_dir, self.server_storage) self.server_blob_manager = BlobManager.DiskBlobManager(self.server_blob_dir, self.server_storage)