summary refs log tree commit diff
path: root/synapse/server.py
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2016-05-17 10:54:39 +0100
committerMark Haines <mjark@negativecurvature.net>2016-05-17 10:54:39 +0100
commitc4c98ce8da402e3b36081e79a63fd2726ec92db0 (patch)
tree2e03fdf537731d9a8d1e8f7a0feaaeb0c9d84eb8 /synapse/server.py
parentMerge pull request #786 from matrix-org/matthew/email_notifs_tuning (diff)
parentMerge remote-tracking branch 'origin/develop' into markjh/liberate_sync_handler (diff)
downloadsynapse-c4c98ce8da402e3b36081e79a63fd2726ec92db0.tar.xz
Merge pull request #790 from matrix-org/markjh/liberate_sync_handler
Move SyncHandler out of the Handlers object
Diffstat (limited to 'synapse/server.py')
-rw-r--r--synapse/server.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/synapse/server.py b/synapse/server.py

index 6d01b68bd4..785a087452 100644 --- a/synapse/server.py +++ b/synapse/server.py
@@ -28,6 +28,7 @@ from synapse.notifier import Notifier from synapse.api.auth import Auth from synapse.handlers import Handlers from synapse.handlers.presence import PresenceHandler +from synapse.handlers.sync import SyncHandler from synapse.state import StateHandler from synapse.storage import DataStore from synapse.util import Clock @@ -80,6 +81,7 @@ class HomeServer(object): 'rest_servlet_factory', 'state_handler', 'presence_handler', + 'sync_handler', 'notifier', 'distributor', 'client_resource', @@ -169,6 +171,9 @@ class HomeServer(object): def build_presence_handler(self): return PresenceHandler(self) + def build_sync_handler(self): + return SyncHandler(self) + def build_event_sources(self): return EventSources(self)