AnnounceZero return None on skipped announce due batching

This commit is contained in:
shortcutme 2018-08-26 22:52:21 +02:00
parent 7a3dbf626e
commit 0b38d73cc5
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
3 changed files with 10 additions and 4 deletions

View file

@ -135,7 +135,7 @@ class SiteAnnouncerPlugin(object):
if res:
latency = res
tracker_storage.onTrackerSuccess(tracker, latency)
else:
elif res is False:
tracker_storage.onTrackerError(tracker)
return res

View file

@ -63,7 +63,7 @@ class SiteAnnouncerPlugin(object):
else: # Multi: Announce all currently serving site
full_announce = True
if time.time() - time_full_announced.get(tracker_address, 0) < 60 * 5: # No reannounce all sites within 5 minute
return []
return None
time_full_announced[tracker_address] = time.time()
from Site import SiteManager
sites = [site for site in SiteManager.site_manager.sites.values() if site.settings["serving"]]
@ -132,4 +132,4 @@ class SiteAnnouncerPlugin(object):
(tracker_address, site_index, peers_added, time.time() - s)
)
return None
return True