summary refs log tree commit diff
path: root/synapse/app/pusher.py
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2018-04-30 01:02:25 +0100
committerGitHub <noreply@github.com>2018-04-30 01:02:25 +0100
commitdb75c86e8463b130d4dcd84e79c1ebee616f9689 (patch)
treeb7c0c3e9262f8ca27470a0151cb5109472da20fa /synapse/app/pusher.py
parentMove more xrange to six (diff)
parentMerge pull request #3085 from NotAFile/py3-config-text-mode (diff)
downloadsynapse-db75c86e8463b130d4dcd84e79c1ebee616f9689.tar.xz
Merge branch 'develop' into py3-xrange-1
Diffstat (limited to 'synapse/app/pusher.py')
-rw-r--r--synapse/app/pusher.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/app/pusher.py b/synapse/app/pusher.py
index 739d113ad5..26930d1b3b 100644
--- a/synapse/app/pusher.py
+++ b/synapse/app/pusher.py
@@ -33,7 +33,7 @@ from synapse.server import HomeServer
 from synapse.storage import DataStore
 from synapse.storage.engines import create_engine
 from synapse.util.httpresourcetree import create_resource_tree
-from synapse.util.logcontext import LoggingContext, preserve_fn
+from synapse.util.logcontext import LoggingContext, run_in_background
 from synapse.util.manhole import manhole
 from synapse.util.versionstring import get_version_string
 from twisted.internet import defer, reactor
@@ -140,7 +140,7 @@ class PusherReplicationHandler(ReplicationClientHandler):
 
     def on_rdata(self, stream_name, token, rows):
         super(PusherReplicationHandler, self).on_rdata(stream_name, token, rows)
-        preserve_fn(self.poke_pushers)(stream_name, token, rows)
+        run_in_background(self.poke_pushers, stream_name, token, rows)
 
     @defer.inlineCallbacks
     def poke_pushers(self, stream_name, token, rows):