summary refs log tree commit diff
path: root/synapse/replication/resource.py
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2016-06-02 15:20:15 +0100
committerMark Haines <mjark@negativecurvature.net>2016-06-02 15:20:15 +0100
commit70599ce9252997d32d0bf9f26a4e02c99bbe474d (patch)
tree7121e2b3cffd5138d34586def2b536ba9ed00426 /synapse/replication/resource.py
parentMerge pull request #817 from matrix-org/dbkr/split_out_auth_handler (diff)
downloadsynapse-70599ce9252997d32d0bf9f26a4e02c99bbe474d.tar.xz
Allow external processes to mark a user as syncing. (#812)
* Add infrastructure to the presence handler to track sync requests in external processes

* Expire stale entries for dead external processes

* Add an http endpoint for making users as syncing

Add some docstrings and comments.

* Fixes
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)