From f7c105fd804bc75940fe20ee2b387486dcd2c8eb Mon Sep 17 00:00:00 2001 From: jobevers Date: Tue, 14 Feb 2017 13:30:14 -0600 Subject: [PATCH] fixes --- lbrynet/lbryfilemanager/EncryptedFileManager.py | 1 - lbrynet/lbrylive/client/LiveStreamDownloader.py | 2 +- tests/functional/test_misc.py | 17 +++++++++++------ 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/lbrynet/lbryfilemanager/EncryptedFileManager.py b/lbrynet/lbryfilemanager/EncryptedFileManager.py index 89900f01d..be08cc8e8 100644 --- a/lbrynet/lbryfilemanager/EncryptedFileManager.py +++ b/lbrynet/lbryfilemanager/EncryptedFileManager.py @@ -270,7 +270,6 @@ class EncryptedFileManager(object): def _save_lbry_file(self, stream_hash, data_payment_rate): def do_save(db_transaction): row = (data_payment_rate, ManagedEncryptedFileDownloader.STATUS_STOPPED, stream_hash) - log.debug('Saving %s to db', row) db_transaction.execute("insert into lbry_file_options values (?, ?, ?)", row) return db_transaction.lastrowid return self.sql_db.runInteraction(do_save) diff --git a/lbrynet/lbrylive/client/LiveStreamDownloader.py b/lbrynet/lbrylive/client/LiveStreamDownloader.py index 913aba7dc..a59eff1cf 100644 --- a/lbrynet/lbrylive/client/LiveStreamDownloader.py +++ b/lbrynet/lbrylive/client/LiveStreamDownloader.py @@ -160,7 +160,7 @@ class FullLiveStreamDownloaderFactory(object): def create_downloader(stream_hash): stream_downloader = FullLiveStreamDownloader(stream_hash, self.peer_finder, self.rate_limiter, self.blob_manager, self.stream_info_manager, - prm, self.wallet, True) + prm, self.wallet) d = stream_downloader.set_stream_info() d.addCallback(lambda _: stream_downloader) return d diff --git a/tests/functional/test_misc.py b/tests/functional/test_misc.py index fef270b03..a9ef36d08 100644 --- a/tests/functional/test_misc.py +++ b/tests/functional/test_misc.py @@ -1,5 +1,3 @@ -from lbrynet.core import log_support - import io import logging from multiprocessing import Process, Event, Queue @@ -61,7 +59,6 @@ GenFile = mocks.GenFile test_create_stream_sd_file = mocks.create_stream_sd_file DummyBlobAvailabilityTracker = mocks.BlobAvailabilityTracker -log = logging.getLogger(__name__) log_format = "%(funcName)s(): %(message)s" logging.basicConfig(level=logging.WARNING, format=log_format) @@ -142,7 +139,11 @@ class LbryUploader(object): d.addCallback(lambda _: self.create_stream()) d.addCallback(self.create_stream_descriptor) d.addCallback(self.put_sd_hash_on_queue) - d.addErrback(log.fail(), 'Failed to start') + + def print_error(err): + logging.critical("Server error: %s", err.getErrorMessage()) + + d.addErrback(print_error) return d def start_server(self): @@ -472,7 +473,11 @@ def start_blob_uploader(blob_hash_queue, kill_event, dead_event, slow, is_genero d.addCallback(lambda _: start_server()) d.addCallback(lambda _: create_single_blob()) d.addCallback(put_blob_hash_on_queue) - d.addErrback(log.fail(), 'Failed to start') + + def print_error(err): + logging.critical("Server error: %s", err.getErrorMessage()) + + d.addErrback(print_error) return d def start_server(): @@ -737,7 +742,7 @@ class TestTransfer(TestCase): factories = metadata.factories chosen_options = [ o.default_value for o in options.get_downloader_options(info_validator, prm)] - return factories[0].make_downloader(metadata, choosen_options, prm) + return factories[0].make_downloader(metadata, chosen_options, prm) def start_lbry_file(lbry_file): lbry_file = lbry_file