summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2018-08-20 10:51:45 +0100
committerGitHub <noreply@github.com>2018-08-20 10:51:45 +0100
commit2aa7cc6a46938890586647144f612e01a2718561 (patch)
tree03ae75862c31b33d4fc0dc6d3f3bdad44627e15b
parentMerge pull request #3709 from matrix-org/rav/logcontext_for_replication_commands (diff)
parentNewsfile (diff)
downloadsynapse-2aa7cc6a46938890586647144f612e01a2718561.tar.xz
Merge pull request #3713 from matrix-org/erikj/fixup_fed_logging
Fix logging bug in EDU handling over replication
Diffstat (limited to '')
-rw-r--r--changelog.d/3713.bugfix1
-rw-r--r--synapse/replication/http/federation.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/3713.bugfix b/changelog.d/3713.bugfix
new file mode 100644
index 0000000000..6c5422994f
--- /dev/null
+++ b/changelog.d/3713.bugfix
@@ -0,0 +1 @@
+Support more federation endpoints on workers
diff --git a/synapse/replication/http/federation.py b/synapse/replication/http/federation.py
index 2ddd18f73b..64a79da162 100644
--- a/synapse/replication/http/federation.py
+++ b/synapse/replication/http/federation.py
@@ -156,7 +156,7 @@ class ReplicationFederationSendEduRestServlet(ReplicationEndpoint):
             edu_content = content["content"]
 
         logger.info(
-            "Got %r edu from $s",
+            "Got %r edu from %s",
             edu_type, origin,
         )