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

Ignore invalid content.json files on merger load

Browse source
This commit is contained in:
shortcutme 2017-01-16 13:39:59 +01:00
parent 391b6e972f
commit 60d58a2d45
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
plugins/MergerSite/MergerSitePlugin.py
View file

@ -5,6 +5,7 @@ from Plugin import PluginManager
from Translate import Translate from Translate import Translate
from util import RateLimit from util import RateLimit
from util import helper from util import helper
from Debug import Debug
try: try:
import OptionalManager.UiWebsocketPlugin # To make optioanlFileInfo merger sites compatible import OptionalManager.UiWebsocketPlugin # To make optioanlFileInfo merger sites compatible
except Exception: except Exception:
@ -298,7 +299,11 @@ class SiteManagerPlugin(object):
return return
for site in self.sites.itervalues(): for site in self.sites.itervalues():
# Update merged sites # Update merged sites
merged_type = site.content_manager.contents.get("content.json", {}).get("merged_type") try:
merged_type = site.content_manager.contents.get("content.json", {}).get("merged_type")
except Exception, err:
self.log.error("Error loading site %s: %s" % (site.address, Debug.formatException(err)))
continue
if merged_type: if merged_type:
merged_db[site.address] = merged_type merged_db[site.address] = merged_type