diff options
| author | Erik Johnston <erik@matrix.org> | 2015-01-30 11:07:57 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-01-30 11:08:01 +0000 |
| commit | 823999716eb506740b34d87fcdaaf3ebbe4f760c (patch) | |
| tree | 884f84fff60a2684b5f8156569d0620b1f17497f /synapse/crypto | |
| parent | Fix regression where we no longer correctly handled the case of gaps in our e... (diff) | |
| download | synapse-823999716eb506740b34d87fcdaaf3ebbe4f760c.tar.xz | |
Fix bug in timeout handling in keyclient
Diffstat (limited to 'synapse/crypto')
| -rw-r--r-- | synapse/crypto/keyclient.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/synapse/crypto/keyclient.py b/synapse/crypto/keyclient.py index 9c910fa3fc..cdb6279764 100644 --- a/synapse/crypto/keyclient.py +++ b/synapse/crypto/keyclient.py @@ -61,9 +61,11 @@ class SynapseKeyClientProtocol(HTTPClient): def __init__(self): self.remote_key = defer.Deferred() + self.host = None def connectionMade(self): - logger.debug("Connected to %s", self.transport.getHost()) + self.host = self.transport.getHost() + logger.debug("Connected to %s", self.host) self.sendCommand(b"GET", b"/_matrix/key/v1/") self.endHeaders() self.timer = reactor.callLater( @@ -92,8 +94,7 @@ class SynapseKeyClientProtocol(HTTPClient): self.timer.cancel() def on_timeout(self): - logger.debug("Timeout waiting for response from %s", - self.transport.getHost()) + logger.debug("Timeout waiting for response from %s", self.host) self.remote_key.errback(IOError("Timeout waiting for response")) self.transport.abortConnection() |