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

Fix double sites.json loading on startup when adding missing sites

Browse source
This commit is contained in:
shortcutme 2020-02-20 17:27:31 +01:00
parent 9b85d8638d
commit ae9a76a6c9
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/Site/SiteManager.py
View file

@ -44,6 +44,8 @@ class SiteManager(object):
except Exception as err: except Exception as err:
raise Exception("Unable to load %s: %s" % (json_path, err)) raise Exception("Unable to load %s: %s" % (json_path, err))
sites_need = []
for address, settings in data.items(): for address, settings in data.items():
if address not in self.sites: if address not in self.sites:
if os.path.isfile("%s/%s/content.json" % (config.data_dir, address)): if os.path.isfile("%s/%s/content.json" % (config.data_dir, address)):
@ -61,7 +63,7 @@ class SiteManager(object):
elif startup: elif startup:
# No site directory, start download # No site directory, start download
self.log.debug("Found new site in sites.json: %s" % address) self.log.debug("Found new site in sites.json: %s" % address)
gevent.spawn(self.need, address, settings=settings) sites_need.append([address, settings])
added += 1 added += 1
address_found.append(address) address_found.append(address)
@ -90,9 +92,11 @@ class SiteManager(object):
if address in content_db.sites: if address in content_db.sites:
del content_db.sites[address] del content_db.sites[address]
self.loaded = True
for address, settings in sites_need:
gevent.spawn(self.need, address, settings=settings)
if added: if added:
self.log.info("Added %s sites in %.3fs" % (added, time.time() - load_s)) self.log.info("Added %s sites in %.3fs" % (added, time.time() - load_s))
self.loaded = True
def saveDelayed(self): def saveDelayed(self):
RateLimit.callAsync("Save sites.json", allowed_again=5, func=self.save) RateLimit.callAsync("Save sites.json", allowed_again=5, func=self.save)