summary refs log tree commit diff
path: root/synapse/replication/resource.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2016-06-02 11:28:22 +0100
committerMark Haines <mark.haines@matrix.org>2016-06-02 11:28:22 +0100
commitb161fae8646566c1d86c21f43f4514c047f8f8ad (patch)
tree09248d95045d6e6f7ab3b0729d00584720089646 /synapse/replication/resource.py
parentStub out the AS handler (diff)
parentAdd an http endpoint for making users as syncing (diff)
downloadsynapse-b161fae8646566c1d86c21f43f4514c047f8f8ad.tar.xz
Merge branch 'markjh/external_presence' into markjh/synchrotron
Diffstat (limited to 'synapse/replication/resource.py')
-rw-r--r--synapse/replication/resource.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/replication/resource.py b/synapse/replication/resource.py

index 847f212a3d..8c2d487ff4 100644 --- a/synapse/replication/resource.py +++ b/synapse/replication/resource.py
@@ -16,6 +16,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 synapse.replication.presence_resource import PresenceResource from twisted.web.resource import Resource from twisted.web.server import NOT_DONE_YET @@ -115,6 +116,7 @@ class ReplicationResource(Resource): self.clock = hs.get_clock() self.putChild("remove_pushers", PusherResource(hs)) + self.putChild("syncing_users", PresenceResource(hs)) def render_GET(self, request): self._async_render_GET(request)