Merge pull request #3909 from turt2live/travis/fix-logging-1

Fix matrixfederationclient.py logging: Destination is a string

2 files changed, 5 insertions, 4 deletions

diff --git a/changelog.d/3909.misc b/changelog.d/3909.misc
new file mode 100644

index 0000000000..a8d72dacad
--- /dev/null
+++ b/changelog.d/3909.misc
@@ -0,0 +1 @@
+Fix log format error in matrixfederationclient.py
diff --git a/synapse/http/matrixfederationclient.py b/synapse/http/matrixfederationclient.py

index 6a2d447289..530c0245a9 100644
--- a/synapse/http/matrixfederationclient.py
+++ b/synapse/http/matrixfederationclient.py
@@ -150,14 +150,14 @@ def _handle_json_response(reactor, timeout_sec, request, response):
         body = yield make_deferred_yieldable(d)
     except Exception as e:
         logger.warn(
-            "{%s} [%d] Error reading response: %s",
+            "{%s} [%s] Error reading response: %s",
             request.txn_id,
             request.destination,
             e,
         )
         raise
     logger.info(
-        "{%s} [%d] Completed: %d %s",
+        "{%s} [%s] Completed: %d %s",
         request.txn_id,
         request.destination,
         response.code,
@@ -707,14 +707,14 @@ class MatrixFederationHttpClient(object):
             length = yield make_deferred_yieldable(d)
         except Exception as e:
             logger.warn(
-                "{%s} [%d] Error reading response: %s",
+                "{%s} [%s] Error reading response: %s",
                 request.txn_id,
                 request.destination,
                 e,
             )
             raise
         logger.info(
-            "{%s} [%d] Completed: %d %s [%d bytes]",
+            "{%s} [%s] Completed: %d %s [%d bytes]",
             request.txn_id,
             request.destination,
             response.code,