diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2016-05-17 10:09:43 +0100 |
|---|---|---|
| committer | Mark Haines <mjark@negativecurvature.net> | 2016-05-17 10:09:43 +0100 |
| commit | b153f5b150086ed62703b05f035677c6509d801d (patch) | |
| tree | f16e0f21537380d516b7b5f841d60f3c92b67c9a /synapse/server.py | |
| parent | Merge pull request #788 from matrix-org/markjh/domian (diff) | |
| parent | Don't inherit PresenceHandler from BaseHandler, remove references to self.hs ... (diff) | |
| download | synapse-b153f5b150086ed62703b05f035677c6509d801d.tar.xz | |
Merge pull request #787 from matrix-org/markjh/liberate_presence_handler
Move the presence handler out of the Handlers object
Diffstat (limited to 'synapse/server.py')
| -rw-r--r-- | synapse/server.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/synapse/server.py b/synapse/server.py index ee138de756..6d01b68bd4 100644 --- a/synapse/server.py +++ b/synapse/server.py @@ -27,6 +27,7 @@ from synapse.http.client import SimpleHttpClient, InsecureInterceptableContextFa from synapse.notifier import Notifier from synapse.api.auth import Auth from synapse.handlers import Handlers +from synapse.handlers.presence import PresenceHandler from synapse.state import StateHandler from synapse.storage import DataStore from synapse.util import Clock @@ -78,6 +79,7 @@ class HomeServer(object): 'auth', 'rest_servlet_factory', 'state_handler', + 'presence_handler', 'notifier', 'distributor', 'client_resource', @@ -164,6 +166,9 @@ class HomeServer(object): def build_state_handler(self): return StateHandler(self) + def build_presence_handler(self): + return PresenceHandler(self) + def build_event_sources(self): return EventSources(self) |