summary refs log tree commit diff
path: root/synapse/app
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-11-23 10:40:44 +0000
committerErik Johnston <erik@matrix.org>2016-11-23 10:40:44 +0000
commit4c79a63fd76e982e5e60b22c7efd15b6e3cf9915 (patch)
tree47bb0578f3bdf45e675184759ed93a7650f1eacb /synapse/app
parentFix tests and flake8 (diff)
downloadsynapse-4c79a63fd76e982e5e60b22c7efd15b6e3cf9915.tar.xz
Explicit federation ack
Diffstat (limited to 'synapse/app')
-rw-r--r--synapse/app/federation_sender.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/app/federation_sender.py b/synapse/app/federation_sender.py
index ba2b4c2615..dcdbe79a17 100644
--- a/synapse/app/federation_sender.py
+++ b/synapse/app/federation_sender.py
@@ -235,7 +235,10 @@ class FederationSenderHandler(object):
     @defer.inlineCallbacks
     def stream_positions(self):
         stream_id = yield self.store.get_federation_out_pos("federation")
-        defer.returnValue({"federation": stream_id})
+        defer.returnValue({
+            "federation": stream_id,
+            "federation_ack": stream_id,
+        })
 
     @defer.inlineCallbacks
     def process_replication(self, result):