diff --git a/lbrynet/core/client/ConnectionManager.py b/lbrynet/core/client/ConnectionManager.py index 683935036..f82f19a20 100644 --- a/lbrynet/core/client/ConnectionManager.py +++ b/lbrynet/core/client/ConnectionManager.py @@ -172,7 +172,7 @@ class ConnectionManager(object): def pick_best_peer(peers): # TODO: Eventually rank them based on past performance/reputation. For now # TODO: just pick the first to which we don't have an open connection - log.debug("Got a list of peers to choose from: %s", str(peers)) + log.debug("Got a list of peers to choose from: %s", str(["%s:%i" % (p.host, p.port) for p in peers])) if peers is None: return None for peer in peers: diff --git a/lbrynet/core/log_support.py b/lbrynet/core/log_support.py index 54a5a03a1..c2f652e74 100644 --- a/lbrynet/core/log_support.py +++ b/lbrynet/core/log_support.py @@ -80,6 +80,7 @@ def disable_noisy_loggers(): logging.getLogger('lbrynet.core.client.ConnectionManager').setLevel(logging.INFO) logging.getLogger('lbrynet.core.client.BlobRequester').setLevel(logging.INFO) logging.getLogger('lbrynet.core.client.ClientProtocol').setLevel(logging.INFO) + logging.getLogger('lbrynet.analytics.api').setLevel(logging.INFO) @_log_decorator diff --git a/lbrynet/lbrynet_daemon/LBRYDaemon.py b/lbrynet/lbrynet_daemon/LBRYDaemon.py index f3a820399..ac888b757 100644 --- a/lbrynet/lbrynet_daemon/LBRYDaemon.py +++ b/lbrynet/lbrynet_daemon/LBRYDaemon.py @@ -2463,6 +2463,15 @@ class LBRYDaemon(jsonrpc.JSONRPC): d.addCallbacks(lambda _: self._render_response(True, OK_CODE), lambda err: self._render_response(err.getTraceback(), OK_CODE)) return d + def jsonrpc_get_blobs(self): + """ + return all blobs + """ + + d = defer.succeed(self.session.blob_manager.blobs) + d.addCallback(lambda r: self._render_response(r, OK_CODE)) + return d + def get_lbrynet_version_from_github(): """Return the latest released version from github.""" diff --git a/lbrynet/reflector/server/server.py b/lbrynet/reflector/server/server.py index 1728a8ed1..6d309cafa 100644 --- a/lbrynet/reflector/server/server.py +++ b/lbrynet/reflector/server/server.py @@ -85,9 +85,7 @@ class ReflectorServer(Protocol): def determine_blob_needed(self, blob): if blob.is_validated(): - d = self.blob_manager.blob_completed(blob) - d.addCallback(lambda _: {'send_blob': False}) - return d + return {'send_blob': False} else: self.incoming_blob = blob self.blob_finished_d, self.blob_write, self.cancel_write = blob.open_for_writing(self.peer)