Merge pull request #122 from zeronet-conservancy/from_enhanced

enhancements from zeronet-enhanced by @geekless
This commit is contained in:
caryoscelus 2022-07-09 17:25:31 +00:00 committed by GitHub
commit 1d8aedce85
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions

View file

@ -987,8 +987,10 @@ class ContentManager(object):
raise VerifyError("Valid signs: %s/%s" % (valid_signs, signs_required))
else:
return self.verifyContent(inner_path, new_content)
else: # Old style signing
elif sign:
raise VerifyError("Invalid old-style sign")
else:
raise VerifyError("Not signed")
except Exception as err:
self.log.warning("%s: verify sign error: %s" % (inner_path, Debug.formatException(err)))

View file

@ -313,8 +313,8 @@ class FileServer(ConnectionServer):
def announceSite(self, site):
site.announce(mode="update", pex=False)
active_site = time.time() - site.settings.get("modified", 0) < 24 * 60 * 60
if site.settings["own"] or active_site:
# Check connections more frequently on own and active sites to speed-up first connections
if active_site:
# Check connections more frequently on active sites to speed-up first connections
site.needConnections(check_site_on_reconnect=True)
site.sendMyHashfield(3)
site.updateHashfield(3)