From bc58add6de3680f8630ced11f849f1f1553854e7 Mon Sep 17 00:00:00 2001
From: Jack Robison <jackrobison@lbry.io>
Date: Fri, 29 Dec 2017 14:09:21 -0500
Subject: [PATCH] logging

---
 lbrynet/core/Wallet.py                          | 12 +++++++++---
 lbrynet/core/client/StreamProgressManager.py    |  3 ++-
 lbrynet/daemon/Daemon.py                        |  4 +++-
 lbrynet/file_manager/EncryptedFileDownloader.py |  2 +-
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/lbrynet/core/Wallet.py b/lbrynet/core/Wallet.py
index 6c237c368..501c0d959 100644
--- a/lbrynet/core/Wallet.py
+++ b/lbrynet/core/Wallet.py
@@ -941,6 +941,7 @@ class Wallet(object):
                                             bid, certificate_id, claim_address, change_address)
 
         if not claim['success']:
+            log.error(claim)
             msg = 'Claim to name {} failed: {}'.format(name, claim['reason'])
             raise Exception(msg)
 
@@ -1312,9 +1313,14 @@ class LBRYumWallet(Wallet):
         return defer.succeed(True)
 
     def _check_large_wallet(self):
-        if len(self.wallet.addresses(include_change=False)) > 1000:
-            log.warning(("Your wallet is excessively large, please follow instructions here: ",
-                         "https://github.com/lbryio/lbry/issues/437 to reduce your wallet size"))
+        addr_count = len(self.wallet.addresses(include_change=False))
+        if addr_count > 1000:
+            log.warning("Your wallet is excessively large (%i addresses), "
+                        "please follow instructions here: "
+                        "https://github.com/lbryio/lbry/issues/437 to reduce your wallet size",
+                        addr_count)
+        else:
+            log.info("Wallet has %i addresses", addr_count)
 
     def _load_blockchain(self):
         blockchain_caught_d = defer.Deferred()
diff --git a/lbrynet/core/client/StreamProgressManager.py b/lbrynet/core/client/StreamProgressManager.py
index bc16fe560..9bfee80b5 100644
--- a/lbrynet/core/client/StreamProgressManager.py
+++ b/lbrynet/core/client/StreamProgressManager.py
@@ -154,7 +154,8 @@ class FullStreamProgressManager(StreamProgressManager):
             d.addCallback(lambda _: check_if_finished())
 
             def log_error(err):
-                log.warning("Error occurred in the output loop. Error: %s", err)
+                log.warning("Error outputting blob %s: %s", blobs[current_blob_num].blob_hash,
+                            err.getErrorMessage())
                 if self.outputting_d is not None and not self.outputting_d.called:
                     self.outputting_d.callback(True)
                     self.outputting_d = None
diff --git a/lbrynet/daemon/Daemon.py b/lbrynet/daemon/Daemon.py
index e3769bc16..b9cee0ff4 100644
--- a/lbrynet/daemon/Daemon.py
+++ b/lbrynet/daemon/Daemon.py
@@ -514,7 +514,7 @@ class Daemon(AuthJSONRPCServer):
 
     @defer.inlineCallbacks
     def _setup_lbry_file_manager(self):
-        log.info('Starting to setup up file manager')
+        log.info('Starting the file manager')
         self.startup_status = STARTUP_STAGES[3]
         self.stream_info_manager = DBEncryptedFileMetadataManager(self.db_dir)
         self.lbry_file_manager = EncryptedFileManager(
@@ -2041,6 +2041,8 @@ class Daemon(AuthJSONRPCServer):
             'claim_address': claim_address,
             'change_address': change_address,
             'claim_dict': claim_dict,
+            'channel_id': channel_id,
+            'channel_name': channel_name
         })
 
         if channel_id:
diff --git a/lbrynet/file_manager/EncryptedFileDownloader.py b/lbrynet/file_manager/EncryptedFileDownloader.py
index 38445cdbe..f9967b07d 100644
--- a/lbrynet/file_manager/EncryptedFileDownloader.py
+++ b/lbrynet/file_manager/EncryptedFileDownloader.py
@@ -27,7 +27,7 @@ def log_status(sd_hash, status):
         status_string = "finished"
     else:
         status_string = "unknown"
-    log.info("stream %s is %s", short_hash(sd_hash), status_string)
+    log.debug("stream %s is %s", short_hash(sd_hash), status_string)
 
 
 class ManagedEncryptedFileDownloader(EncryptedFileSaver):