diff options
| author | Matthew Hodgson <matthew@matrix.org> | 2018-03-13 22:11:58 +0000 |
|---|---|---|
| committer | Matthew Hodgson <matthew@matrix.org> | 2018-03-13 22:11:58 +0000 |
| commit | 12350e3f9aeac73f80d1c5bb35ef9e5d0887dec0 (patch) | |
| tree | 1db11e8ee3cd835de2c8d33aaf9534573d0ac357 /synapse/handlers/federation.py | |
| parent | ensure we always include the members for a given timeline block (diff) | |
| parent | typoe (diff) | |
| download | synapse-12350e3f9aeac73f80d1c5bb35ef9e5d0887dec0.tar.xz | |
merge proper fix to bug 2969
Diffstat (limited to 'synapse/handlers/federation.py')
| -rw-r--r-- | synapse/handlers/federation.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index 520612683e..080aca3d71 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -68,7 +68,7 @@ class FederationHandler(BaseHandler): self.hs = hs self.store = hs.get_datastore() - self.replication_layer = hs.get_replication_layer() + self.replication_layer = hs.get_federation_client() self.state_handler = hs.get_state_handler() self.server_name = hs.hostname self.keyring = hs.get_keyring() @@ -78,8 +78,6 @@ class FederationHandler(BaseHandler): self.spam_checker = hs.get_spam_checker() self.event_creation_handler = hs.get_event_creation_handler() - self.replication_layer.set_handler(self) - # When joining a room we need to queue any events for that room up self.room_queues = {} self._room_pdu_linearizer = Linearizer("fed_room_pdu") |