From b6bafaa1969d5e5ab8e9e74278a698c5acb02ce4 Mon Sep 17 00:00:00 2001 From: Eric Eastwood Date: Fri, 3 Oct 2025 15:46:14 -0500 Subject: [PATCH 1/2] Fix bad with `start_background_tasks` This was originally removed in https://github.com/element-hq/synapse/pull/18886 but it looks like it snuck back in https://github.com/element-hq/synapse/pull/18828 during a bad merge --- synapse/server.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/synapse/server.py b/synapse/server.py index cc0d3a427b4..2c8afda162f 100644 --- a/synapse/server.py +++ b/synapse/server.py @@ -613,12 +613,6 @@ def setup(self) -> None: self.datastores = Databases(self.DATASTORE_CLASS, self) logger.info("Finished setting up.") - # Register background tasks required by this server. This must be done - # somewhat manually due to the background tasks not being registered - # unless handlers are instantiated. - if self.config.worker.run_background_tasks: - self.start_background_tasks() - # def __del__(self) -> None: # """ # Called when an the homeserver is garbage collected. From e37b129c0569a02e6d006e0263de436e4a41f2d6 Mon Sep 17 00:00:00 2001 From: Eric Eastwood Date: Fri, 3 Oct 2025 16:35:06 -0500 Subject: [PATCH 2/2] Add changelog --- changelog.d/19013.misc | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/19013.misc diff --git a/changelog.d/19013.misc b/changelog.d/19013.misc new file mode 100644 index 00000000000..626a6e3db41 --- /dev/null +++ b/changelog.d/19013.misc @@ -0,0 +1 @@ +Remove duplicate call to `hs.start_background_tasks()` introduced from a bad merge.