From 9904404003a649d61ccd2117cee81fff5be43bbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= Date: Wed, 4 Apr 2018 23:34:48 +0200 Subject: [PATCH] chg: Catch aiohttp.ClientError --- bgpranking/modulesfetcher.py | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/bgpranking/modulesfetcher.py b/bgpranking/modulesfetcher.py index 9b96472..0174bc4 100644 --- a/bgpranking/modulesfetcher.py +++ b/bgpranking/modulesfetcher.py @@ -133,15 +133,18 @@ class Fetcher(): if not await self.__newer(): unset_running('{}-{}-{}'.format(self.__class__.__name__, self.vendor, self.listname)) return - async with aiohttp.ClientSession() as session: - async with session.get(self.url) as r: - content = await r.content.read() - if self.__same_as_last(content): - return - self.logger.info('Got a new file \o/') - with (self.directory / '{}.txt'.format(datetime.now().isoformat())).open('wb') as f: - f.write(content) - unset_running('{}-{}-{}'.format(self.__class__.__name__, self.vendor, self.listname)) + try: + async with aiohttp.ClientSession() as session: + async with session.get(self.url) as r: + content = await r.content.read() + if self.__same_as_last(content): + return + self.logger.info('Got a new file \o/') + with (self.directory / '{}.txt'.format(datetime.now().isoformat())).open('wb') as f: + f.write(content) + unset_running('{}-{}-{}'.format(self.__class__.__name__, self.vendor, self.listname)) + except aiohttp.ClientError as e: + self.logger.exception('Fetching the list failed: {}'.format(e)) except PidFileError: self.logger.info('Fetcher already running') finally: