diff options
author | Mark Haines <mjark@negativecurvature.net> | 2014-11-20 17:54:40 +0000 |
---|---|---|
committer | Mark Haines <mjark@negativecurvature.net> | 2014-11-20 17:54:40 +0000 |
commit | 8f8c484bc6d7e9a35d8d9a75fb629eca2a96f9f5 (patch) | |
tree | b1ebd402c0805f475500c9f36a0356322bf26f13 /synapse/crypto | |
parent | Fix pep8 codestyle warnings (diff) | |
parent | Merge branch 'develop' into http_client_refactor (diff) | |
download | synapse-8f8c484bc6d7e9a35d8d9a75fb629eca2a96f9f5.tar.xz |
Merge pull request #20 from matrix-org/http_client_refactor
Http client refactor
Diffstat (limited to 'synapse/crypto')
-rw-r--r-- | synapse/crypto/keyclient.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/crypto/keyclient.py b/synapse/crypto/keyclient.py index bb1f400b54..3f37c99261 100644 --- a/synapse/crypto/keyclient.py +++ b/synapse/crypto/keyclient.py @@ -17,7 +17,7 @@ from twisted.web.http import HTTPClient from twisted.internet.protocol import Factory from twisted.internet import defer, reactor -from synapse.http.endpoint import matrix_endpoint +from synapse.http.endpoint import matrix_federation_endpoint from synapse.util.logcontext import PreserveLoggingContext import json import logging @@ -31,7 +31,7 @@ def fetch_server_key(server_name, ssl_context_factory): """Fetch the keys for a remote server.""" factory = SynapseKeyClientFactory() - endpoint = matrix_endpoint( + endpoint = matrix_federation_endpoint( reactor, server_name, ssl_context_factory, timeout=30 ) @@ -48,7 +48,7 @@ def fetch_server_key(server_name, ssl_context_factory): class SynapseKeyClientError(Exception): - """The key wasn't retireved from the remote server.""" + """The key wasn't retrieved from the remote server.""" pass |