Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

Send the correct host header when fetching keys #941

Merged
merged 3 commits into from Jul 28, 2016

Conversation

Projects
None yet
2 participants
Owner

erikjohnston commented Jul 21, 2016

No description provided.

erikjohnston added some commits Jul 21, 2016

Contributor

NegativeMjark commented Jul 21, 2016

LGTM

@NegativeMjark NegativeMjark commented on an outdated diff Jul 21, 2016

synapse/crypto/keyclient.py
@@ -124,7 +123,10 @@ def handleResponse(self, response_body_bytes):
self.timer.cancel()
def on_timeout(self):
- logger.debug("Timeout waiting for response from %s", self.host)
+ logger.debug(
+ "Timeout waiting for response from %s: %s",
+ self.host, self.transport.getPeer(),
@NegativeMjark

NegativeMjark Jul 21, 2016

Contributor

You can't call getPeer() here cause the connection might have disappeared.

Contributor

NegativeMjark commented Jul 22, 2016

Actually LGTM

@erikjohnston erikjohnston merged commit 78cac3e into develop Jul 28, 2016

10 checks passed

Flake8 + Packaging (Commit) Build #1210 origin/erikj/key_client_fix succeeded in 35 sec
Details
Flake8 + Packaging (Merged PR) Build finished.
Details
Sytest Dendron (Commit) Build #322 origin/erikj/key_client_fix succeeded in 7 min 25 sec
Details
Sytest Dendron (Merged PR) Build finished.
Details
Sytest Postgres (Commit) Build #1158 origin/erikj/key_client_fix succeeded in 6 min 41 sec
Details
Sytest Postgres (Merged PR) Build finished.
Details
Sytest SQLite (Commit) Build #1181 origin/erikj/key_client_fix succeeded in 6 min 19 sec
Details
Sytest SQLite (Merged PR) Build finished.
Details
Unit Tests (Commit) Build #1247 origin/erikj/key_client_fix succeeded in 2 min 20 sec
Details
Unit Tests (Merged PR) Build finished.
Details

@richvdh richvdh deleted the erikj/key_client_fix branch Dec 1, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment