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/federation/federation_base.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/federation/federation_base.py')
-rw-r--r-- | synapse/federation/federation_base.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/synapse/federation/federation_base.py b/synapse/federation/federation_base.py index 7918d3e442..79eaa31031 100644 --- a/synapse/federation/federation_base.py +++ b/synapse/federation/federation_base.py @@ -27,7 +27,13 @@ logger = logging.getLogger(__name__) class FederationBase(object): def __init__(self, hs): + self.hs = hs + + self.server_name = hs.hostname + self.keyring = hs.get_keyring() self.spam_checker = hs.get_spam_checker() + self.store = hs.get_datastore() + self._clock = hs.get_clock() @defer.inlineCallbacks def _check_sigs_and_hash_and_fetch(self, origin, pdus, outlier=False, |