From b597ad0b3f13c6970d8fe9714fc403595092eb59 Mon Sep 17 00:00:00 2001 From: Jack Robison Date: Fri, 27 Dec 2019 22:54:29 -0500 Subject: [PATCH 1/4] fix unique constraint failure in migrate12to13 --- lbry/lbry/extras/daemon/migrator/migrate12to13.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; From 87c6e292f1298980d26f41674f512898f548fa62 Mon Sep 17 00:00:00 2001 From: Jack Robison Date: Fri, 27 Dec 2019 22:55:44 -0500 Subject: [PATCH 2/4] fix wallet server SessionManager._get_info --- torba/torba/server/session.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From d3e7f789b24c7373813ac41eb7c6498e52cd250f Mon Sep 17 00:00:00 2001 From: Jack Robison Date: Fri, 27 Dec 2019 22:57:26 -0500 Subject: [PATCH 3/4] uncaught exception --- lbry/lbry/dht/protocol/protocol.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lbry/lbry/dht/protocol/protocol.py b/lbry/lbry/dht/protocol/protocol.py index d8a84da45..569c452d0 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()) From 5bd222c26659ffc3a4a2bae1080a34d9f3492f0e Mon Sep 17 00:00:00 2001 From: Jack Robison Date: Fri, 27 Dec 2019 22:58:55 -0500 Subject: [PATCH 4/4] less verbose log --- lbry/lbry/dht/protocol/protocol.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lbry/lbry/dht/protocol/protocol.py b/lbry/lbry/dht/protocol/protocol.py index 569c452d0..7cbaad3e5 100644 --- a/lbry/lbry/dht/protocol/protocol.py +++ b/lbry/lbry/dht/protocol/protocol.py @@ -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: