From ec7a0bf569a8d8fe4c54a7554419655a21036c70 Mon Sep 17 00:00:00 2001 From: Noah Levitt Date: Thu, 31 May 2018 16:57:37 -0700 Subject: [PATCH] =?UTF-8?q?log=20exception=20and=20continue=20=F0=9F=A4=9E?= =?UTF-8?q?=20if=20schema=20reg=20fails?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit at trough dedup startup --- setup.py | 2 +- warcprox/dedup.py | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 81e46c0..6ac73a1 100755 --- a/setup.py +++ b/setup.py @@ -40,7 +40,7 @@ except: setuptools.setup( name='warcprox', - version='2.4b2.dev175', + version='2.4b2.dev176', description='WARC writing MITM HTTP/S proxy', url='https://github.com/internetarchive/warcprox', author='Noah Levitt', diff --git a/warcprox/dedup.py b/warcprox/dedup.py index 83f3e0a..81be2ea 100644 --- a/warcprox/dedup.py +++ b/warcprox/dedup.py @@ -497,7 +497,13 @@ class TroughDedupDb(DedupDb, DedupableMixin): return BatchTroughStorer(self, self.options) def start(self): - self._trough_cli.register_schema(self.SCHEMA_ID, self.SCHEMA_SQL) + try: + self._trough_cli.register_schema(self.SCHEMA_ID, self.SCHEMA_SQL) + except Exception as e: + # can happen. hopefully someone else has registered it + self.logger.critical( + 'will try to continue after problem registering schema %s', + self.SCHEMA_ID, exc_info=True) def save(self, digest_key, response_record, bucket='__unspecified__'): record_id = response_record.get_header(warctools.WarcRecord.ID)