From 3e7eb45eb1bc6d02a6cd439f2829a63ac4835b55 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erikj@element.io>
Date: Tue, 13 Aug 2024 15:00:57 +0100
Subject: [PATCH] Fixup media logcontexts (#17561)

Regression from #17558
---
 changelog.d/17561.misc |  1 +
 synapse/media/_base.py | 11 +++++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 changelog.d/17561.misc

diff --git a/changelog.d/17561.misc b/changelog.d/17561.misc
new file mode 100644
index 000000000..cfa8089a8
--- /dev/null
+++ b/changelog.d/17561.misc
@@ -0,0 +1 @@
+Speed up responding to media requests.
diff --git a/synapse/media/_base.py b/synapse/media/_base.py
index 21f334339..ad80098e9 100644
--- a/synapse/media/_base.py
+++ b/synapse/media/_base.py
@@ -50,7 +50,11 @@ from twisted.web.server import Request
 from synapse.api.errors import Codes, cs_error
 from synapse.http.server import finish_request, respond_with_json
 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.util import Clock
 from synapse.util.stringutils import is_ascii
@@ -657,7 +661,7 @@ class ThreadedFileSender:
 
         # We set the wakeup signal as we should start producing immediately.
         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)
 
@@ -672,6 +676,9 @@ class ThreadedFileSender:
     def stopProducing(self) -> None:
         """interfaces.IPushProducer"""
 
+        # Unregister the consumer so we don't try and interact with it again.
+        self.consumer = None
+
         # Terminate the thread loop.
         self.wakeup_event.set()
         self.stop_event.set()