summary refs log tree commit diff
diff options
context:
space:
mode:
authorPatrick Cloke <patrickc@matrix.org>2021-10-12 14:21:05 -0400
committerPatrick Cloke <patrickc@matrix.org>2021-10-12 14:21:05 -0400
commit9abc5f2a051f8ab49cb7a51f80bda78fbee6aa07 (patch)
tree4f32d577953922d65d981ed3a9c3a2e0f4e53b0e
parentAdd tests for `MediaFilePaths` (#11057) (diff)
parentFix formatting string when oEmbed errors occur. (#11061) (diff)
downloadsynapse-9abc5f2a051f8ab49cb7a51f80bda78fbee6aa07.tar.xz
Merge remote-tracking branch 'origin/release-v1.45' into develop
-rw-r--r--changelog.d/11061.bugfix1
-rw-r--r--synapse/rest/media/v1/oembed.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/11061.bugfix b/changelog.d/11061.bugfix
new file mode 100644
index 0000000000..26fb643793
--- /dev/null
+++ b/changelog.d/11061.bugfix
@@ -0,0 +1 @@
+Fix a bug introduced in Synapse v1.44.0 when logging errors during oEmbed processing.
diff --git a/synapse/rest/media/v1/oembed.py b/synapse/rest/media/v1/oembed.py
index 6d7e1f9064..78b1603f19 100644
--- a/synapse/rest/media/v1/oembed.py
+++ b/synapse/rest/media/v1/oembed.py
@@ -191,7 +191,7 @@ class OEmbedProvider:
 
         except Exception as e:
             # Trap any exception and let the code follow as usual.
-            logger.warning(f"Error parsing oEmbed metadata from {url}: {e:r}")
+            logger.warning("Error parsing oEmbed metadata from %s: %r", url, e)
             open_graph_response = {}
             cache_age = None