summary refs log tree commit diff
path: root/synapse/state.py
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/state.py
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/state.py')
-rw-r--r--synapse/state.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/state.py b/synapse/state.py
index 8003099c88..b9d5627a82 100644
--- a/synapse/state.py
+++ b/synapse/state.py
@@ -89,7 +89,7 @@ class StateHandler(object):
 
         # dict of set of event_ids -> _StateCacheEntry.
         self._state_cache = None
-        self.resolve_linearizer = Linearizer()
+        self.resolve_linearizer = Linearizer(name="state_resolve_lock")
 
     def start_caching(self):
         logger.debug("start_caching")