From 887a07c3fb68695e8b984cb62c86bd4acc6905f6 Mon Sep 17 00:00:00 2001 From: shortcutme Date: Sat, 27 Aug 2016 11:01:41 +0200 Subject: [PATCH] Rev1427, Skip invalid files on dbRebuild --- src/Config.py | 2 +- src/Site/SiteStorage.py | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/Config.py b/src/Config.py index 096624b5..3f7d0a44 100644 --- a/src/Config.py +++ b/src/Config.py @@ -8,7 +8,7 @@ class Config(object): def __init__(self, argv): self.version = "0.4.0" - self.rev = 1426 + self.rev = 1427 self.argv = argv self.action = None self.config_file = "zeronet.conf" diff --git a/src/Site/SiteStorage.py b/src/Site/SiteStorage.py index 62ccb066..b4fea010 100644 --- a/src/Site/SiteStorage.py +++ b/src/Site/SiteStorage.py @@ -118,8 +118,12 @@ class SiteStorage(object): s = time.time() try: for file_inner_path, file in self.getDbFiles(): - if self.db.loadJson(file_inner_path, file=file, cur=cur): - found += 1 + try: + if self.db.loadJson(file_inner_path, file=file, cur=cur): + found += 1 + except Exception, err: + self.log.error("Error importing %s: %s" % (file_inner_path, Debug.formatException(err))) + finally: cur.execute("END") self.log.info("Imported %s data file in %ss" % (found, time.time() - s))