Fix unbound access of log (when the captured exception is a timeout) (

#4889)
WordPress · Sep 9, 2024 · de091ba · de091ba
1 parent e0130b2
commit de091ba
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/api/api/utils/image_proxy/extension.py b/api/api/utils/image_proxy/extension.py
@@ -91,7 +91,7 @@ async def get_image_extension(media_info: MediaInfo) -> str | None:
                 else:
                     log = logger.error
 
-            log("upstream_thumbnail_exception", exc=exc, exc_info=True)
+                log("upstream_thumbnail_exception", exc=exc, exc_info=True)
 
             raise UpstreamThumbnailException(
                 "Failed to render thumbnail due to inability to check media "

diff --git a/api/test/unit/utils/test_image_proxy.py b/api/test/unit/utils/test_image_proxy.py
@@ -1,3 +1,4 @@
+import asyncio
 import contextlib
 from dataclasses import replace
 from urllib.parse import urlencode
@@ -336,8 +337,8 @@ def test_get_successful_records_response_code(
             "aiohttp.client_exceptions.ClientConnectionError",
         ),
         (
-            client_exceptions.ServerTimeoutError("whoops"),
-            "aiohttp.client_exceptions.ServerTimeoutError",
+            asyncio.TimeoutError("whoops"),
+            "builtins.TimeoutError",
         ),
         (
             client_exceptions.ClientSSLError(MOCK_CONNECTION_KEY, OSError()),