diff options
| author | Erik Johnston <erik@matrix.org> | 2018-08-03 09:25:15 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-08-03 09:25:15 +0100 |
| commit | cb298ff623c1ad375084f7687b7f6e546c4c1c1f (patch) | |
| tree | 81854fc4ae0a45bed487a58f2c40974b683adb92 /synapse/federation/transport | |
| parent | Newsfile (diff) | |
| parent | Merge pull request #3645 from matrix-org/michaelkaye/mention_newsfragment (diff) | |
| download | synapse-cb298ff623c1ad375084f7687b7f6e546c4c1c1f.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/refactor_repl_servlet
Diffstat (limited to 'synapse/federation/transport')
| -rw-r--r-- | synapse/federation/transport/server.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/synapse/federation/transport/server.py b/synapse/federation/transport/server.py index 8574898f0c..eae5f2b427 100644 --- a/synapse/federation/transport/server.py +++ b/synapse/federation/transport/server.py @@ -165,7 +165,7 @@ def _parse_auth_header(header_bytes): param_dict = dict(kv.split("=") for kv in params) def strip_quotes(value): - if value.startswith(b"\""): + if value.startswith("\""): return value[1:-1] else: return value @@ -283,11 +283,10 @@ class FederationSendServlet(BaseFederationServlet): ) logger.info( - "Received txn %s from %s. (PDUs: %d, EDUs: %d, failures: %d)", + "Received txn %s from %s. (PDUs: %d, EDUs: %d)", transaction_id, origin, len(transaction_data.get("pdus", [])), len(transaction_data.get("edus", [])), - len(transaction_data.get("failures", [])), ) # We should ideally be getting this from the security layer. |