mirrors/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2024-12-15 17:51:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixup media logcontexts (#17561)

Browse source 
Regression from #17558
This commit is contained in:
Erik Johnston 2024-08-13 15:00:57 +01:00 committed by GitHub
parent 9f9ec92526
commit 3e7eb45eb1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/17561.misc Normal file
View file

@ -0,0 +1 @@
Speed up responding to media requests.

11
synapse/media/_base.py
View file

@ -50,7 +50,11 @@ from twisted.web.server import Request
from synapse.api.errors import Codes, cs_error from synapse.api.errors import Codes, cs_error
from synapse.http.server import finish_request, respond_with_json from synapse.http.server import finish_request, respond_with_json
from synapse.http.site import SynapseRequest from synapse.http.site import SynapseRequest
from synapse.logging.context import defer_to_thread, make_deferred_yieldable from synapse.logging.context import (
defer_to_thread,
make_deferred_yieldable,
run_in_background,
)
from synapse.types import ISynapseReactor from synapse.types import ISynapseReactor
from synapse.util import Clock from synapse.util import Clock
from synapse.util.stringutils import is_ascii from synapse.util.stringutils import is_ascii
@ -657,7 +661,7 @@ class ThreadedFileSender:
# We set the wakeup signal as we should start producing immediately. # We set the wakeup signal as we should start producing immediately.
self.wakeup_event.set() self.wakeup_event.set()
defer_to_thread(self.reactor, self._on_thread_read_loop) run_in_background(defer_to_thread, self.reactor, self._on_thread_read_loop)
return make_deferred_yieldable(self.deferred) return make_deferred_yieldable(self.deferred)
@ -672,6 +676,9 @@ class ThreadedFileSender:
def stopProducing(self) -> None: def stopProducing(self) -> None:
"""interfaces.IPushProducer""" """interfaces.IPushProducer"""
# Unregister the consumer so we don't try and interact with it again.
self.consumer = None
# Terminate the thread loop. # Terminate the thread loop.
self.wakeup_event.set() self.wakeup_event.set()
self.stop_event.set() self.stop_event.set()