summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorDavid Robertson <davidr@element.io>2023-09-04 10:42:51 +0100
committerDavid Robertson <davidr@element.io>2023-09-04 10:42:51 +0100
commite4fe4dbecd1ba2355159003fb1245085a583f24d (patch)
treef8961d9ae62124e1fc96cb858d203fc6052a97c9 /synapse
parentMerge remote-tracking branch 'origin/develop' into matrix-org-hotfixes (diff)
parentTentatively update changelog (diff)
downloadsynapse-e4fe4dbecd1ba2355159003fb1245085a583f24d.tar.xz
Merge remote-tracking branch 'origin/release-v1.91' into matrix-org-hotfixes
Diffstat (limited to 'synapse')
-rw-r--r--synapse/server.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/server.py b/synapse/server.py

index 7cdd3ea3c2..8f5e4fc140 100644 --- a/synapse/server.py +++ b/synapse/server.py
@@ -914,6 +914,7 @@ class HomeServer(metaclass=abc.ABCMeta): """Usage metrics shared between phone home stats and the prometheus exporter.""" return CommonUsageMetricsManager(self) + @cache_in_self def get_worker_locks_handler(self) -> WorkerLocksHandler: return WorkerLocksHandler(self)