diff options
| author | kaiyou <pierre@jaury.eu> | 2018-05-02 20:22:41 +0200 |
|---|---|---|
| committer | kaiyou <pierre@jaury.eu> | 2018-05-02 20:22:41 +0200 |
| commit | 9a779c2ddb88f875d3ceec4ff02bdb922a0c57c6 (patch) | |
| tree | 1034b986ea37a081707b489cb3ebe6e4d584defe /synapse/app | |
| parent | Make the logging level configurable (diff) | |
| parent | missing word :| (diff) | |
| download | synapse-9a779c2ddb88f875d3ceec4ff02bdb922a0c57c6.tar.xz | |
Merge remote-tracking branch 'upstream/master' into feat-dockerfile
Diffstat (limited to 'synapse/app')
| -rw-r--r-- | synapse/app/frontend_proxy.py | 2 | ||||
| -rw-r--r-- | synapse/app/synchrotron.py | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/synapse/app/frontend_proxy.py b/synapse/app/frontend_proxy.py index de889357c3..b349e3e3ce 100644 --- a/synapse/app/frontend_proxy.py +++ b/synapse/app/frontend_proxy.py @@ -90,7 +90,7 @@ class KeyUploadServlet(RestServlet): # They're actually trying to upload something, proxy to main synapse. # Pass through the auth headers, if any, in case the access token # is there. - auth_headers = request.requestHeaders.getRawHeaders("Authorization", []) + auth_headers = request.requestHeaders.getRawHeaders(b"Authorization", []) headers = { "Authorization": auth_headers, } diff --git a/synapse/app/synchrotron.py b/synapse/app/synchrotron.py index 508b66613d..2fddcd935a 100644 --- a/synapse/app/synchrotron.py +++ b/synapse/app/synchrotron.py @@ -58,6 +58,8 @@ from synapse.util.versionstring import get_version_string from twisted.internet import defer, reactor from twisted.web.resource import NoResource +from six import iteritems + logger = logging.getLogger("synapse.app.synchrotron") @@ -211,7 +213,7 @@ class SynchrotronPresence(object): def get_currently_syncing_users(self): return [ - user_id for user_id, count in self.user_to_num_current_syncs.iteritems() + user_id for user_id, count in iteritems(self.user_to_num_current_syncs) if count > 0 ] |