diff options
| author | David Baker <dave@matrix.org> | 2016-06-02 15:33:28 +0100 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2016-06-02 15:33:28 +0100 |
| commit | 812b5de0feeb905643faf4decff3d7b566d3dbe9 (patch) | |
| tree | 70c5d4a2dab2e35bc39711392cba52e22e5a145f /synapse/replication/resource.py | |
| parent | Merge branch 'dbkr/split_out_auth_handler' into dbkr/email_unsubscribe (diff) | |
| parent | Fix setting the _clock in SQLBaseStore (diff) | |
| download | synapse-812b5de0feeb905643faf4decff3d7b566d3dbe9.tar.xz | |
Merge remote-tracking branch 'origin/develop' into dbkr/email_unsubscribe
Diffstat (limited to 'synapse/replication/resource.py')
| -rw-r--r-- | synapse/replication/resource.py | 2 |
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) |