summary refs log tree commit diff
path: root/synapse/federation
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/federation
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/federation')
-rw-r--r--synapse/federation/federation_server.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/federation/federation_server.py b/synapse/federation/federation_server.py
index 1fee4e83a6..862ccbef5d 100644
--- a/synapse/federation/federation_server.py
+++ b/synapse/federation/federation_server.py
@@ -52,8 +52,8 @@ class FederationServer(FederationBase):
 
         self.auth = hs.get_auth()
 
-        self._room_pdu_linearizer = Linearizer()
-        self._server_linearizer = Linearizer()
+        self._room_pdu_linearizer = Linearizer("fed_room_pdu")
+        self._server_linearizer = Linearizer("fed_server")
 
         # We cache responses to state queries, as they take a while and often
         # come in waves.