diff --git a/plugins/AnnounceZero/AnnounceZeroPlugin.py b/plugins/AnnounceZero/AnnounceZeroPlugin.py index 623cd4b5..d57190b2 100644 --- a/plugins/AnnounceZero/AnnounceZeroPlugin.py +++ b/plugins/AnnounceZero/AnnounceZeroPlugin.py @@ -124,7 +124,7 @@ class SiteAnnouncerPlugin(object): sign = CryptRsa.sign(res["onion_sign_this"].encode("utf8"), self.site.connection_server.tor_manager.getPrivatekey(onion)) request["onion_signs"][publickey] = sign res = tracker_peer.request("announce", request) - if not res or "onion_sign_this" in res: + if not res: if full_announce: time_full_announced[tracker_address] = 0 raise AnnounceError("Announce onion address to failed: %s" % res) diff --git a/src/Peer/Peer.py b/src/Peer/Peer.py index 03cc1f47..e525b421 100644 --- a/src/Peer/Peer.py +++ b/src/Peer/Peer.py @@ -157,10 +157,11 @@ class Peer(object): for retry in range(1, 4): # Retry 3 times try: if not self.connection: + # this is redundant, already established that self.connection is present raise Exception("No connection found") res = self.connection.request(cmd, params, stream_to) if not res: - raise Exception("Send error") + raise Exception("Send error: result is empty") if "error" in res: self.log("%s error: %s" % (cmd, res["error"])) self.onConnectionError("Response error")