summary refs log tree commit diff
path: root/synapse/handlers/federation.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2021-09-14 11:02:37 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2021-09-14 11:02:37 +0100
commit003c2ab629ac23e5a789b8152f45f999a21dcfb2 (patch)
tree389f4e154384a4aea61aff018c0027f89b5179d0 /synapse/handlers/federation.py
parentMerge remote-tracking branch 'origin/develop' into matrix-org-hotfixes (diff)
parentUse direct references for some configuration variables (#10798) (diff)
downloadsynapse-003c2ab629ac23e5a789b8152f45f999a21dcfb2.tar.xz
Merge branch 'release-v1.43' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/handlers/federation.py')
-rw-r--r--synapse/handlers/federation.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py

index 77df9185f6..6754c64c31 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py
@@ -101,7 +101,7 @@ class FederationHandler(BaseHandler): hs ) - if hs.config.worker_app: + if hs.config.worker.worker_app: self._maybe_store_room_on_outlier_membership = ( ReplicationStoreRoomOnOutlierMembershipRestServlet.make_client(hs) ) @@ -1614,7 +1614,7 @@ class FederationHandler(BaseHandler): Args: room_id """ - if self.config.worker_app: + if self.config.worker.worker_app: await self._clean_room_for_join_client(room_id) else: await self.store.clean_room_for_join(room_id)