Catch TimeoutError while retrieving certificates (#594)

marcelveldt · web-flow · commit 7eeb288a31d1 · 2024-02-27T22:55:59.000+01:00
diff --git a/matter_server/server/helpers/paa_certificates.py b/matter_server/server/helpers/paa_certificates.py
@@ -106,7 +106,7 @@ async def fetch_dcl_certificates(
                     )
                     LAST_CERT_IDS.add(paa["subjectKeyId"])
                     fetch_count += 1
-    except ClientError as err:
+    except (ClientError, TimeoutError) as err:
         LOGGER.warning(
             "Fetching latest certificates failed: error %s", err, exc_info=err
         )
@@ -142,7 +142,7 @@ async def fetch_git_certificates() -> int:
                 await write_paa_root_cert(certificate, cert)
                 LAST_CERT_IDS.add(cert)
                 fetch_count += 1
-    except ClientError as err:
+    except (ClientError, TimeoutError) as err:
         LOGGER.warning(
             "Fetching latest certificates failed: error %s", err, exc_info=err
         )

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ async def fetch_dcl_certificates(`
`106`	`106`	`)`
`107`	`107`	`LAST_CERT_IDS.add(paa["subjectKeyId"])`
`108`	`108`	`fetch_count += 1`
`109`		`- except ClientError as err:`
	`109`	`+ except (ClientError, TimeoutError) as err:`
`110`	`110`	`LOGGER.warning(`
`111`	`111`	`"Fetching latest certificates failed: error %s", err, exc_info=err`
`112`	`112`	`)`
`@@ -142,7 +142,7 @@ async def fetch_git_certificates() -> int:`
`142`	`142`	`await write_paa_root_cert(certificate, cert)`
`143`	`143`	`LAST_CERT_IDS.add(cert)`
`144`	`144`	`fetch_count += 1`
`145`		`- except ClientError as err:`
	`145`	`+ except (ClientError, TimeoutError) as err:`
`146`	`146`	`LOGGER.warning(`
`147`	`147`	`"Fetching latest certificates failed: error %s", err, exc_info=err`
`148`	`148`	`)`