diff options
author | David Baker <dbkr@matrix.org> | 2014-11-20 17:41:56 +0000 |
---|---|---|
committer | David Baker <dbkr@matrix.org> | 2014-11-20 17:41:56 +0000 |
commit | e377d3365293a25a9f4d38706da60f2c221fdf89 (patch) | |
tree | e20adc94d762f36500b93a655b19e4fb8852747a /synapse/crypto | |
parent | Oops, I removed this param. (diff) | |
download | synapse-e377d3365293a25a9f4d38706da60f2c221fdf89.tar.xz |
Separate out the matrix http client completely because just about all of its code it now separate from the simple case we need for standard HTTP(S)
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 |