summary refs log tree commit diff
path: root/synapse/replication
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2016-05-17 10:13:16 +0100
committerMark Haines <mark.haines@matrix.org>2016-05-17 10:13:16 +0100
commit425e6b4983ccb01bf9053edb14ff23a7eb9a0afb (patch)
tree7bdebcc130261183a7d3864f56857e7006df3454 /synapse/replication
parentRemove get_joined_rooms_for_user from RoomMemberHandler (diff)
parentMerge pull request #787 from matrix-org/markjh/liberate_presence_handler (diff)
downloadsynapse-425e6b4983ccb01bf9053edb14ff23a7eb9a0afb.tar.xz
Merge branch 'develop' into markjh/member_cleanup
Diffstat (limited to 'synapse/replication')
-rw-r--r--synapse/replication/resource.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/replication/resource.py b/synapse/replication/resource.py
index 0e983ae7fa..b0e7a17670 100644
--- a/synapse/replication/resource.py
+++ b/synapse/replication/resource.py
@@ -109,7 +109,7 @@ class ReplicationResource(Resource):
         self.version_string = hs.version_string
         self.store = hs.get_datastore()
         self.sources = hs.get_event_sources()
-        self.presence_handler = hs.get_handlers().presence_handler
+        self.presence_handler = hs.get_presence_handler()
         self.typing_handler = hs.get_handlers().typing_notification_handler
         self.notifier = hs.notifier
         self.clock = hs.get_clock()