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

Fix matrixfederationclient.py logging: Destination is a string
matrix-org · Sep 19, 2018 · 47c02e6 · 47c02e6
2 parents 3f0d8e6 + 13b31a9
commit 47c02e6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/changelog.d/3909.misc 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
@@ -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 @@ def get_file(self, destination, path, output_stream, args={},
             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,
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fix log format error in matrixfederationclient.py