summary refs log tree commit diff
path: root/synapse/replication/resource.py
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2016-04-21 16:33:05 +0100
committerMark Haines <mjark@negativecurvature.net>2016-04-21 16:33:05 +0100
commitcfe1ff4bdb9296ff2a7dc167dabf4397f81634f7 (patch)
treecc69c1f28752c1d8ad7e1fc9d6edb91466b62b6c /synapse/replication/resource.py
parentpip install new python dependencies in jenkins.sh (diff)
downloadsynapse-cfe1ff4bdb9296ff2a7dc167dabf4397f81634f7.tar.xz
Add a replication endpoint for deleting pushers
Diffstat (limited to 'synapse/replication/resource.py')
-rw-r--r--synapse/replication/resource.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/synapse/replication/resource.py b/synapse/replication/resource.py
index a543af68f8..e5c9a53929 100644
--- a/synapse/replication/resource.py
+++ b/synapse/replication/resource.py
@@ -15,6 +15,7 @@
 
 from synapse.http.servlet import parse_integer, parse_string
 from synapse.http.server import request_handler, finish_request
+from synapse.replication.pusher_resource import PusherResource
 
 from twisted.web.resource import Resource
 from twisted.web.server import NOT_DONE_YET
@@ -102,8 +103,6 @@ class ReplicationResource(Resource):
     long-polling this replication API for new data on those streams.
     """
 
-    isLeaf = True
-
     def __init__(self, hs):
         Resource.__init__(self)  # Resource is old-style, so no super()
 
@@ -114,6 +113,8 @@ class ReplicationResource(Resource):
         self.typing_handler = hs.get_handlers().typing_notification_handler
         self.notifier = hs.notifier
 
+        self.putChild("remove_pushers", PusherResource(hs))
+
     def render_GET(self, request):
         self._async_render_GET(request)
         return NOT_DONE_YET
@@ -343,7 +344,7 @@ class ReplicationResource(Resource):
                 "app_id", "app_display_name", "device_display_name", "pushkey",
                 "ts", "lang", "data"
             ))
-            writer.write_header_and_rows("deleted", deleted, (
+            writer.write_header_and_rows("deleted_pushers", deleted, (
                 "position", "user_id", "app_id", "pushkey"
             ))