diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-11-20 16:24:00 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-11-20 16:24:00 +0000 |
| commit | 32090aee169aafc9da4efa176b50a5fc8ede68d2 (patch) | |
| tree | c7606c2aecdce27c83e0e2dc95393a95761c7934 /synapse/handlers/federation.py | |
| parent | Merge branch 'master' into develop (diff) | |
| download | synapse-32090aee169aafc9da4efa176b50a5fc8ede68d2.tar.xz | |
Add a few missing yields, Move deferred lists inside PreserveLoggingContext because they don't interact well with the logging contexts
Diffstat (limited to 'synapse/handlers/federation.py')
| -rw-r--r-- | synapse/handlers/federation.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index 492005a170..e8fb7eae58 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -209,7 +209,7 @@ class FederationHandler(BaseHandler): if event.type == RoomMemberEvent.TYPE: if event.membership == Membership.JOIN: user = self.hs.parse_userid(event.state_key) - self.distributor.fire( + yield self.distributor.fire( "user_joined_room", user=user, room_id=event.room_id ) @@ -414,7 +414,7 @@ class FederationHandler(BaseHandler): if event.type == RoomMemberEvent.TYPE: if event.membership == Membership.JOIN: user = self.hs.parse_userid(event.state_key) - self.distributor.fire( + yield self.distributor.fire( "user_joined_room", user=user, room_id=event.room_id ) |