]> Frank Brehm's Git Trees - pixelpark/puppetmaster-webhooks.git/commitdiff
Improve exception handling on getting forge module information
authorFrank Brehm <frank.brehm@pixelpark.com>
Thu, 2 Sep 2021 07:21:18 +0000 (09:21 +0200)
committerFrank Brehm <frank.brehm@pixelpark.com>
Thu, 2 Sep 2021 07:21:18 +0000 (09:21 +0200)
lib/webhooks/forge/mod_info.py

index 56f98c4a823b70f848734ec109f7896e0d16a053..88a30994cf9f6105fa873dedce24bad29973dc72 100644 (file)
@@ -20,6 +20,8 @@ import time
 import requests
 import pytz
 
+from requests.exceptions import ReadTimeout, ConnectTimeout
+
 # Own modules
 from fb_tools.common import pp, to_bool
 from ..errors import BaseHookError
@@ -506,7 +508,7 @@ class ForgeModuleInfo(BaseModuleInfo):
             warnings.simplefilter("always")
             try:
                 response = session.request('GET', url, timeout=http_timeout)
-            except requests.exceptions.ReadTimeout as e:
+            except (ReadTimeout, ConnectTimeout) as e:
                 msg = "{c} on getting module info for {m}: {e}".format(
                     c=e.__class__.__name__, m=full_name,  e=e)
                 raise BaseHookError(msg)