Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Spelling and comments

This commit is contained in:
Erik Johnston 2016-12-29 00:10:49 +00:00
parent b7336ff32d
commit 68030fd37b
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
synapse/http/endpoint.py
View File

@ -66,18 +66,18 @@ def matrix_federation_endpoint(reactor, destination, ssl_context_factory=None,
default_port = 8448 default_port = 8448
if port is None: if port is None:
return _WrappingEndointFac(SRVClientEndpoint( return _WrappingEndpointFac(SRVClientEndpoint(
reactor, "matrix", domain, protocol="tcp", reactor, "matrix", domain, protocol="tcp",
default_port=default_port, endpoint=transport_endpoint, default_port=default_port, endpoint=transport_endpoint,
endpoint_kw_args=endpoint_kw_args endpoint_kw_args=endpoint_kw_args
)) ))
else: else:
return _WrappingEndointFac(transport_endpoint( return _WrappingEndpointFac(transport_endpoint(
reactor, domain, port, **endpoint_kw_args reactor, domain, port, **endpoint_kw_args
)) ))
class _WrappingEndointFac(object): class _WrappingEndpointFac(object):
def __init__(self, endpoint_fac): def __init__(self, endpoint_fac):
self.endpoint_fac = endpoint_fac self.endpoint_fac = endpoint_fac
@ -105,7 +105,9 @@ class _WrappedConnection(object):
setattr(self.conn, name, value) setattr(self.conn, name, value)
def _time_things_out_maybe(self): def _time_things_out_maybe(self):
if time.time() - self.last_request >= 2 * 60: # We use a slightly shorter timeout here just in case the callLater is
# triggered early. Paranoia ftw.
if time.time() - self.last_request >= 2.5 * 60:
self.abort() self.abort()
def request(self, request): def request(self, request):