Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2024-12-18 10:54:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove more spurious PreserveLoggingContexts

Browse Source 
Remove `PreserveLoggingContext` around calls to `Notifier.on_new_room_event`;
there is no problem if the logcontext is set when calling it.
This commit is contained in:
Richard van der Hoff 2017-04-03 15:43:37 +01:00
parent 65e1683680
commit 0b08c48fc5
1 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
synapse/handlers/federation.py
View File

@ -28,7 +28,7 @@ from synapse.api.constants import EventTypes, Membership, RejectedReason
from synapse.events.validator import EventValidator from synapse.events.validator import EventValidator
from synapse.util import unwrapFirstError from synapse.util import unwrapFirstError
from synapse.util.logcontext import ( from synapse.util.logcontext import (
PreserveLoggingContext, preserve_fn, preserve_context_over_deferred preserve_fn, preserve_context_over_deferred
) )
from synapse.util.metrics import measure_func from synapse.util.metrics import measure_func
from synapse.util.logutils import log_function from synapse.util.logutils import log_function
@ -394,11 +394,10 @@ class FederationHandler(BaseHandler):
target_user = UserID.from_string(target_user_id) target_user = UserID.from_string(target_user_id)
extra_users.append(target_user) extra_users.append(target_user)
with PreserveLoggingContext(): self.notifier.on_new_room_event(
self.notifier.on_new_room_event( event, event_stream_id, max_stream_id,
event, event_stream_id, max_stream_id, extra_users=extra_users
extra_users=extra_users )
)
if event.type == EventTypes.Member: if event.type == EventTypes.Member:
if event.membership == Membership.JOIN: if event.membership == Membership.JOIN:
@ -916,11 +915,10 @@ class FederationHandler(BaseHandler):
origin, auth_chain, state, event origin, auth_chain, state, event
) )
with PreserveLoggingContext(): self.notifier.on_new_room_event(
self.notifier.on_new_room_event( event, event_stream_id, max_stream_id,
event, event_stream_id, max_stream_id, extra_users=[joinee]
extra_users=[joinee] )
)
logger.debug("Finished joining %s to %s", joinee, room_id) logger.debug("Finished joining %s to %s", joinee, room_id)
finally: finally:
@ -1025,10 +1023,9 @@ class FederationHandler(BaseHandler):
target_user = UserID.from_string(target_user_id) target_user = UserID.from_string(target_user_id)
extra_users.append(target_user) extra_users.append(target_user)
with PreserveLoggingContext(): self.notifier.on_new_room_event(
self.notifier.on_new_room_event( event, event_stream_id, max_stream_id, extra_users=extra_users
event, event_stream_id, max_stream_id, extra_users=extra_users )
)
if event.type == EventTypes.Member: if event.type == EventTypes.Member:
if event.content["membership"] == Membership.JOIN: if event.content["membership"] == Membership.JOIN:
@ -1074,11 +1071,10 @@ class FederationHandler(BaseHandler):
) )
target_user = UserID.from_string(event.state_key) target_user = UserID.from_string(event.state_key)
with PreserveLoggingContext(): self.notifier.on_new_room_event(
self.notifier.on_new_room_event( event, event_stream_id, max_stream_id,
event, event_stream_id, max_stream_id, extra_users=[target_user],
extra_users=[target_user], )
)
defer.returnValue(event) defer.returnValue(event)
@ -1236,10 +1232,9 @@ class FederationHandler(BaseHandler):
target_user = UserID.from_string(target_user_id) target_user = UserID.from_string(target_user_id)
extra_users.append(target_user) extra_users.append(target_user)
with PreserveLoggingContext(): self.notifier.on_new_room_event(
self.notifier.on_new_room_event( event, event_stream_id, max_stream_id, extra_users=extra_users
event, event_stream_id, max_stream_id, extra_users=extra_users )
)
defer.returnValue(None) defer.returnValue(None)