summary refs log tree commit diff
path: root/synapse/federation/federation_client.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2016-06-16 11:20:17 +0100
committerMark Haines <mark.haines@matrix.org>2016-06-16 11:20:17 +0100
commitf1f70bf4b5172beb1eae671ad4016e342a6cdc92 (patch)
tree7c6cfa9161a534505eb4e33588a1300647100ebd /synapse/federation/federation_client.py
parentAdd worker config module (diff)
parentMerge pull request #873 from vt0r/bugfix/bcrypt-utf8-encode (diff)
downloadsynapse-f1f70bf4b5172beb1eae671ad4016e342a6cdc92.tar.xz
Merge remote-tracking branch 'origin/develop' into markjh/worker_config
Diffstat (limited to 'synapse/federation/federation_client.py')
-rw-r--r--synapse/federation/federation_client.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/federation/federation_client.py b/synapse/federation/federation_client.py
index d835c1b038..b06387051c 100644
--- a/synapse/federation/federation_client.py
+++ b/synapse/federation/federation_client.py
@@ -52,6 +52,8 @@ sent_queries_counter = metrics.register_counter("sent_queries", labels=["type"])
 
 
 class FederationClient(FederationBase):
+    def __init__(self, hs):
+        super(FederationClient, self).__init__(hs)
 
     def start_get_pdu_cache(self):
         self._get_pdu_cache = ExpiringCache(