summaryrefslogtreecommitdiff
path: root/synapse/rest/media/v1/thumbnail_resource.py
diff options
context:
space:
mode:
authorAndrej Shadura <andrewsh@debian.org>2019-12-01 11:02:18 +0100
committerAndrej Shadura <andrewsh@debian.org>2019-12-01 11:02:18 +0100
commit1c1b52e4c5d41ad1a138c34d27994c052a55b83b (patch)
tree194a31b7847880b75cb52345f6535f2df4dff5c2 /synapse/rest/media/v1/thumbnail_resource.py
parented93259bb49a2b1808408b55dcb72883a8bc4d33 (diff)
parent11311f62092daee712cb2aac8b0333fd0904bdfd (diff)
Merge branch 'debian/master' into debian/buster-backports
Diffstat (limited to 'synapse/rest/media/v1/thumbnail_resource.py')
-rw-r--r--synapse/rest/media/v1/thumbnail_resource.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/rest/media/v1/thumbnail_resource.py b/synapse/rest/media/v1/thumbnail_resource.py
index 08329884..931ce79b 100644
--- a/synapse/rest/media/v1/thumbnail_resource.py
+++ b/synapse/rest/media/v1/thumbnail_resource.py
@@ -182,7 +182,7 @@ class ThumbnailResource(DirectServeResource):
if file_path:
yield respond_with_file(request, desired_type, file_path)
else:
- logger.warn("Failed to generate thumbnail")
+ logger.warning("Failed to generate thumbnail")
respond_404(request)
@defer.inlineCallbacks
@@ -245,7 +245,7 @@ class ThumbnailResource(DirectServeResource):
if file_path:
yield respond_with_file(request, desired_type, file_path)
else:
- logger.warn("Failed to generate thumbnail")
+ logger.warning("Failed to generate thumbnail")
respond_404(request)
@defer.inlineCallbacks