summary refs log tree commit diff
path: root/synapse/federation/federation_server.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-03-12 14:07:39 +0000
committerErik Johnston <erik@matrix.org>2018-03-13 10:51:30 +0000
commite05bf34117de19705b36a4803085ea93f7381928 (patch)
tree61a44bab00810ba6b1a97b8a583998b5afa9ebbb /synapse/federation/federation_server.py
parentFix tests (diff)
downloadsynapse-e05bf34117de19705b36a4803085ea93f7381928.tar.xz
Move property setting from ReplicationLayer to FederationBase
Diffstat (limited to 'synapse/federation/federation_server.py')
-rw-r--r--synapse/federation/federation_server.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/synapse/federation/federation_server.py b/synapse/federation/federation_server.py
index 5b1914f2f4..dd73fc50b2 100644
--- a/synapse/federation/federation_server.py
+++ b/synapse/federation/federation_server.py
@@ -23,6 +23,8 @@ from synapse.federation.federation_base import (
     FederationBase,
     event_from_pdu_json,
 )
+
+from synapse.federation.persistence import TransactionActions
 from synapse.federation.units import Edu, Transaction
 import synapse.metrics
 from synapse.types import get_domain_from_id
@@ -56,6 +58,10 @@ class FederationServer(FederationBase):
         self._server_linearizer = async.Linearizer("fed_server")
         self._transaction_linearizer = async.Linearizer("fed_txn_handler")
 
+        self.transaction_actions = TransactionActions(self.store)
+
+        self.handler = None
+
         self.registry = hs.get_federation_registry()
 
         # We cache responses to state queries, as they take a while and often