mirrors/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2024-12-20 10:55:09 +03:00
Code Issues Projects Releases Packages Wiki Activity

Preserve log contexts in the room_member_handler

Browse source
This commit is contained in:
Travis Ralston 2018-11-21 13:21:21 -07:00 committed by Brendan Abolivier
parent de6d002d01
commit b26d8cea66
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
synapse/handlers/room_member.py
View file

@ -30,6 +30,7 @@ import synapse.types
from synapse.api.constants import EventTypes, Membership from synapse.api.constants import EventTypes, Membership
from synapse.api.errors import AuthError, Codes, SynapseError from synapse.api.errors import AuthError, Codes, SynapseError
from synapse.types import RoomID, UserID, RoomAlias from synapse.types import RoomID, UserID, RoomAlias
from synapse.util import logcontext
from synapse.util.async_helpers import Linearizer from synapse.util.async_helpers import Linearizer
from synapse.util.distributor import user_joined_room, user_left_room from synapse.util.distributor import user_joined_room, user_left_room
@ -416,7 +417,10 @@ class RoomMemberHandler(object):
ret = yield self._remote_join( ret = yield self._remote_join(
requester, remote_room_hosts, room_id, target, content requester, remote_room_hosts, room_id, target, content
) )
self._send_merged_user_invites(requester, room_id) logcontext.run_in_background(
self._send_merged_user_invites,
requester, room_id,
)
defer.returnValue(ret) defer.returnValue(ret)
elif effective_membership_state == Membership.LEAVE: elif effective_membership_state == Membership.LEAVE:
@ -451,7 +455,10 @@ class RoomMemberHandler(object):
prev_events_and_hashes=prev_events_and_hashes, prev_events_and_hashes=prev_events_and_hashes,
content=content, content=content,
) )
self._send_merged_user_invites(requester, room_id) logcontext.run_in_background(
self._send_merged_user_invites,
requester, room_id,
)
defer.returnValue(res) defer.returnValue(res)
@defer.inlineCallbacks @defer.inlineCallbacks