From 6cd18bbf04c98059dba12244c26831c25b0c3538 Mon Sep 17 00:00:00 2001 From: shortcutme Date: Wed, 7 Aug 2019 14:11:30 +0200 Subject: [PATCH] Display more clean error on users.json/sites.json load error --- src/Site/SiteManager.py | 8 +++++++- src/User/UserManager.py | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/Site/SiteManager.py b/src/Site/SiteManager.py index 4af4e2d5..bb9fe308 100644 --- a/src/Site/SiteManager.py +++ b/src/Site/SiteManager.py @@ -33,7 +33,13 @@ class SiteManager(object): address_found = [] added = 0 # Load new adresses - for address, settings in json.load(open("%s/sites.json" % config.data_dir)).items(): + try: + json_path = "%s/sites.json" % config.data_dir + data = json.load(open(json_path)) + except Exception as err: + raise Exception("Unable to load %s: %s" % (json_path, err)) + + for address, settings in data.items(): if address not in self.sites: if os.path.isfile("%s/%s/content.json" % (config.data_dir, address)): # Root content.json exists, try load site diff --git a/src/User/UserManager.py b/src/User/UserManager.py index e1f069c0..067734a6 100644 --- a/src/User/UserManager.py +++ b/src/User/UserManager.py @@ -24,7 +24,13 @@ class UserManager(object): added = 0 s = time.time() # Load new users - for master_address, data in list(json.load(open("%s/users.json" % config.data_dir)).items()): + try: + json_path = "%s/users.json" % config.data_dir + data = json.load(open(json_path)) + except Exception as err: + raise Exception("Unable to load %s: %s" % (json_path, err)) + + for master_address, data in list(data.items()): if master_address not in self.users: user = User(master_address, data=data) self.users[master_address] = user