Merge remote-tracking branch 'origin/release-v1.45' into develop

This commit is contained in:
Patrick Cloke 2021-10-12 14:21:05 -04:00
commit 9abc5f2a05
2 changed files with 2 additions and 1 deletions

1
changelog.d/11061.bugfix Normal file
View file

@ -0,0 +1 @@
Fix a bug introduced in Synapse v1.44.0 when logging errors during oEmbed processing.

View file

@ -191,7 +191,7 @@ class OEmbedProvider:
except Exception as e: except Exception as e:
# Trap any exception and let the code follow as usual. # 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 = {} open_graph_response = {}
cache_age = None cache_age = None