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

Don't allow parallel sites.json loading

Browse source
This commit is contained in:
shortcutme 2020-01-22 16:35:40 +01:00
parent e75e199334
commit a9368bb3c8
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Site/SiteManager.py
View file

@ -7,6 +7,7 @@ import atexit
import gevent
import util
from Plugin import PluginManager
from Content import ContentDb
from Config import config
@ -27,12 +28,15 @@ class SiteManager(object):
atexit.register(lambda: self.save(recalculate_size=True))
# Load all sites from data/sites.json
@util.Noparallel()
def load(self, cleanup=True, startup=False):
self.log.debug("Loading sites...")
from Debug import Debug
self.log.info("Loading sites... (cleanup: %s, startup: %s)" % (cleanup, startup))
self.loaded = False
from .Site import Site
address_found = []
added = 0
load_s = time.time()
# Load new adresses
try:
json_path = "%s/sites.json" % config.data_dir
@ -87,7 +91,7 @@ class SiteManager(object):
del content_db.sites[address]
if added:
self.log.debug("SiteManager added %s sites" % added)
self.log.info("Added %s sites in %.3fs" % (added, time.time() - load_s))
self.loaded = True
def saveDelayed(self):
@ -196,7 +200,7 @@ class SiteManager(object):
def delete(self, address):
self.sites_changed = int(time.time())
self.log.debug("SiteManager deleted site: %s" % address)
self.log.debug("Deleted site: %s" % address)
del(self.sites[address])
# Delete from sites.json
self.save()