summary refs log tree commit diff
path: root/synapse/rest
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2017-01-10 14:04:45 +0000
committerGitHub <noreply@github.com>2017-01-10 14:04:45 +0000
commit07c3c08fad768b22ab5cad7a1a2d8ca3f989f474 (patch)
treece34c8e95e5a880172bc3681fe019902a843bbb9 /synapse/rest
parentMerge branch 'master' of github.com:matrix-org/synapse into develop (diff)
parentName linearizer's for better logs (diff)
downloadsynapse-07c3c08fad768b22ab5cad7a1a2d8ca3f989f474.tar.xz
Merge pull request #1786 from matrix-org/erikj/linearizer_name
Name linearizer's for better logs
Diffstat (limited to 'synapse/rest')
-rw-r--r--synapse/rest/media/v1/media_repository.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/media/v1/media_repository.py b/synapse/rest/media/v1/media_repository.py
index 692e078419..2b693ae548 100644
--- a/synapse/rest/media/v1/media_repository.py
+++ b/synapse/rest/media/v1/media_repository.py
@@ -61,7 +61,7 @@ class MediaRepository(object):
         self.dynamic_thumbnails = hs.config.dynamic_thumbnails
         self.thumbnail_requirements = hs.config.thumbnail_requirements
 
-        self.remote_media_linearizer = Linearizer()
+        self.remote_media_linearizer = Linearizer(name="media_remote")
 
         self.recently_accessed_remotes = set()