Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove redundant PreserveLoggingContext 

Both (!) things that register as replication listeners do the right thing wrt
logcontexts, so this is redundant.
This commit is contained in:
Richard van der Hoff 2019-03-04 18:31:18 +00:00
parent daa10e3e66
commit c7325776a7
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
synapse/notifier.py
View File

@ -203,7 +203,9 @@ class Notifier(object):
def add_replication_callback(self, cb): def add_replication_callback(self, cb):
"""Add a callback that will be called when some new data is available. """Add a callback that will be called when some new data is available.
Callback is not given any arguments. Callback is not given any arguments. It should *not* return a Deferred - if
it needs to do any asynchronous work, a background thread should be started and
wrapped with run_as_background_process.
""" """
self.replication_callbacks.append(cb) self.replication_callbacks.append(cb)
@ -515,12 +517,5 @@ class Notifier(object):
def notify_replication(self): def notify_replication(self):
"""Notify the any replication listeners that there's a new event""" """Notify the any replication listeners that there's a new event"""
with PreserveLoggingContext(): for cb in self.replication_callbacks:
# the callbacks may well outlast the current request, so we run cb()
# them in the sentinel logcontext.
#
# (ideally it would be up to the callbacks to know if they were
# starting off background processes and drop the logcontext
# accordingly, but that requires more changes)
for cb in self.replication_callbacks:
cb()