diff options
| author | Kegan Dougal <kegan@matrix.org> | 2015-02-02 15:57:59 +0000 |
|---|---|---|
| committer | Kegan Dougal <kegan@matrix.org> | 2015-02-02 15:57:59 +0000 |
| commit | c059c9fea5e3ef36cadc136e055284953556c4ed (patch) | |
| tree | 39faa451578ceecc16c92c390a564ebec4fc2373 /synapse/crypto/keyclient.py | |
| parent | Add basic application_services SQL, and hook up parts of the appservice store... (diff) | |
| parent | Ignore empty strings for display names & room names in notifications (diff) | |
| download | synapse-c059c9fea5e3ef36cadc136e055284953556c4ed.tar.xz | |
Merge branch 'develop' into application-services
Conflicts: synapse/handlers/__init__.py synapse/storage/__init__.py
Diffstat (limited to 'synapse/crypto/keyclient.py')
| -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() |