Skip to content

Commit 3e7eb45

Browse files
authored
Fixup media logcontexts (#17561)
Regression from #17558
1 parent 9f9ec92 commit 3e7eb45

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

changelog.d/17561.misc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Speed up responding to media requests.

synapse/media/_base.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,11 @@
5050
from synapse.api.errors import Codes, cs_error
5151
from synapse.http.server import finish_request, respond_with_json
5252
from synapse.http.site import SynapseRequest
53-
from synapse.logging.context import defer_to_thread, make_deferred_yieldable
53+
from synapse.logging.context import (
54+
defer_to_thread,
55+
make_deferred_yieldable,
56+
run_in_background,
57+
)
5458
from synapse.types import ISynapseReactor
5559
from synapse.util import Clock
5660
from synapse.util.stringutils import is_ascii
@@ -657,7 +661,7 @@ def beginFileTransfer(
657661

658662
# We set the wakeup signal as we should start producing immediately.
659663
self.wakeup_event.set()
660-
defer_to_thread(self.reactor, self._on_thread_read_loop)
664+
run_in_background(defer_to_thread, self.reactor, self._on_thread_read_loop)
661665

662666
return make_deferred_yieldable(self.deferred)
663667

@@ -672,6 +676,9 @@ def pauseProducing(self) -> None:
672676
def stopProducing(self) -> None:
673677
"""interfaces.IPushProducer"""
674678

679+
# Unregister the consumer so we don't try and interact with it again.
680+
self.consumer = None
681+
675682
# Terminate the thread loop.
676683
self.wakeup_event.set()
677684
self.stop_event.set()

0 commit comments

Comments
 (0)