diff --git a/lbry/lbry/dht/protocol/protocol.py b/lbry/lbry/dht/protocol/protocol.py index d8a84da45..7cbaad3e5 100644 --- a/lbry/lbry/dht/protocol/protocol.py +++ b/lbry/lbry/dht/protocol/protocol.py @@ -224,7 +224,7 @@ class PingQueue: self._protocol.add_peer(peer) return await self._protocol.get_rpc_peer(peer).ping() - except asyncio.TimeoutError: + except (asyncio.TimeoutError, RemoteException): pass task = self._loop.create_task(ping_task()) @@ -668,7 +668,7 @@ class KademliaProtocol(DatagramProtocol): log.debug("peer %s:%i is running an incompatible version of lbrynet", peer.address, peer.udp_port) return peer.node_id, False if 'Invalid token' not in str(err): - log.exception("Unexpected error while storing blob_hash") + log.warning("Unexpected error while storing blob_hash: %s", err) return peer.node_id, False self.peer_manager.clear_token(peer.node_id) if not retry: diff --git a/lbry/lbry/extras/daemon/migrator/migrate12to13.py b/lbry/lbry/extras/daemon/migrator/migrate12to13.py index 05bf7aee7..b89ef3f4e 100644 --- a/lbry/lbry/extras/daemon/migrator/migrate12to13.py +++ b/lbry/lbry/extras/daemon/migrator/migrate12to13.py @@ -65,7 +65,7 @@ def do_migration(conf): added_on from file; - insert into new_content_claim (stream_hash, bt_infohash, claim_outpoint) + insert or ignore into new_content_claim (stream_hash, bt_infohash, claim_outpoint) select stream_hash, NULL, claim_outpoint from content_claim; drop table file; diff --git a/torba/torba/server/session.py b/torba/torba/server/session.py index fe78133bc..57ce6b4b9 100644 --- a/torba/torba/server/session.py +++ b/torba/torba/server/session.py @@ -286,7 +286,7 @@ class SessionManager: def _get_info(self): """A summary of server state.""" group_map = self._group_map() - method_counts = collections.defaultdict(0) + method_counts = collections.defaultdict(int) error_count = 0 logged = 0 paused = 0