oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't reannounce site if just added

Browse source
This commit is contained in:
shortcutme 2018-08-26 02:57:02 +02:00
parent 8738817eab
commit c5c3f7a667
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Ui/UiRequest.py
View file

@ -283,6 +283,7 @@ class UiRequest(object):
extra_headers = {} extra_headers = {}
match = re.match("/(?P<address>[A-Za-z0-9\._-]+)(?P<inner_path>/.*|$)", path) match = re.match("/(?P<address>[A-Za-z0-9\._-]+)(?P<inner_path>/.*|$)", path)
just_added = False
if match: if match:
address = match.group("address") address = match.group("address")
inner_path = match.group("inner_path").lstrip("/") inner_path = match.group("inner_path").lstrip("/")
@ -310,9 +311,12 @@ class UiRequest(object):
title = "Loading %s..." % address title = "Loading %s..." % address
site = SiteManager.site_manager.get(address) site = SiteManager.site_manager.get(address)
if site: # Already added, but not downloaded if site: # Already added, but not downloaded
gevent.spawn(site.update, announce=True) if time.time() - site.announcer.time_last_announce > 5:
site.log.debug("Reannouncing site...")
gevent.spawn(site.update, announce=True)
else: # If not added yet else: # If not added yet
site = SiteManager.site_manager.need(address) site = SiteManager.site_manager.need(address)
just_added = True
if not site: if not site:
return False return False
@ -320,7 +324,7 @@ class UiRequest(object):
self.sendHeader(extra_headers=extra_headers) self.sendHeader(extra_headers=extra_headers)
min_last_announce = (time.time() - site.announcer.time_last_announce) / 60 min_last_announce = (time.time() - site.announcer.time_last_announce) / 60
if min_last_announce > 60 and site.settings["serving"]: if min_last_announce > 60 and site.settings["serving"] and not just_added:
site.log.debug("Site requested, but not announced recently (last %.0fmin ago). Updating..." % min_last_announce) site.log.debug("Site requested, but not announced recently (last %.0fmin ago). Updating..." % min_last_announce)
gevent.spawn(site.update, announce=True) gevent.spawn(site.update, announce=True)