summary refs log tree commit diff
path: root/synapse/handlers/room_member.py
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2016-08-12 10:14:12 +0100
committerGitHub <noreply@github.com>2016-08-12 10:14:12 +0100
commit5006c4b30dacd419e0a3189691e30c9ab606ebd9 (patch)
tree6f9ab42ec3413a08f10d7b3c6e458e9c73bd204c /synapse/handlers/room_member.py
parentMerge pull request #997 from Half-Shot/develop (diff)
parentOnly process one local membership event per room at a time (diff)
downloadsynapse-5006c4b30dacd419e0a3189691e30c9ab606ebd9.tar.xz
Merge pull request #1005 from matrix-org/erikj/linearize_joins
Only process one local membership event per room at a time
Diffstat (limited to 'synapse/handlers/room_member.py')
-rw-r--r--synapse/handlers/room_member.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/room_member.py b/synapse/handlers/room_member.py
index 8cec8fc4ed..4709112a0c 100644
--- a/synapse/handlers/room_member.py
+++ b/synapse/handlers/room_member.py
@@ -141,7 +141,7 @@ class RoomMemberHandler(BaseHandler):
             third_party_signed=None,
             ratelimit=True,
     ):
-        key = (target, room_id,)
+        key = (room_id,)
 
         with (yield self.member_linearizer.queue(key)):
             result = yield self._update_membership(