From 0b5051823fb05ca7528fcd1882508421f8943cb1 Mon Sep 17 00:00:00 2001 From: Kay Kurokawa Date: Thu, 15 Jun 2017 14:31:02 -0400 Subject: [PATCH 1/3] fix case when downloader is stopped before sd_hash is loaded --- lbrynet/lbryfilemanager/EncryptedFileDownloader.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lbrynet/lbryfilemanager/EncryptedFileDownloader.py b/lbrynet/lbryfilemanager/EncryptedFileDownloader.py index c00a3ebe3..d6d83c019 100644 --- a/lbrynet/lbryfilemanager/EncryptedFileDownloader.py +++ b/lbrynet/lbryfilemanager/EncryptedFileDownloader.py @@ -83,7 +83,7 @@ class ManagedEncryptedFileDownloader(EncryptedFileSaver): @defer.inlineCallbacks def stop(self, err=None, change_status=True): - log.debug('Stopping download for %s', short_hash(self.sd_hash)) + log.debug('Stopping download for stream %s', short_hash(self.stream_hash)) # EncryptedFileSaver deletes metadata when it's stopped. We don't want that here. yield EncryptedFileDownloader.stop(self, err=err) if change_status is True: From 114f6ef8f843c210d490089a11b184be64062c4b Mon Sep 17 00:00:00 2001 From: Kay Kurokawa Date: Thu, 15 Jun 2017 15:58:32 -0400 Subject: [PATCH 2/3] fix file_delete log from throwing exception on unicode file_name --- lbrynet/lbrynet_daemon/Daemon.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lbrynet/lbrynet_daemon/Daemon.py b/lbrynet/lbrynet_daemon/Daemon.py index 972adc8a1..ab684cec2 100644 --- a/lbrynet/lbrynet_daemon/Daemon.py +++ b/lbrynet/lbrynet_daemon/Daemon.py @@ -1626,7 +1626,7 @@ class Daemon(AuthJSONRPCServer): del self.streams[lbry_file.claim_id] yield self.lbry_file_manager.delete_lbry_file(lbry_file, delete_file=delete_from_download_dir) - log.info("Deleted %s (%s)", file_name, utils.short_hash(stream_hash)) + log.info("Deleted file: %s", file_name) result = True response = yield self._render_response(result) From a324a3147e0caebac6bbbc3aff42ab1699d640f4 Mon Sep 17 00:00:00 2001 From: Kay Kurokawa Date: Thu, 15 Jun 2017 16:13:49 -0400 Subject: [PATCH 3/3] add changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1affe57cd..ee9399d37 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,7 +25,7 @@ at anytime. * Various fixes for GetStream class used in API command get * Download analytics error * Fixed flag options in file_delete API command - * + * Fixed some log messages throwing exceptions ### Deprecated *