diff options
author | David Baker <dbkr@users.noreply.github.com> | 2015-01-28 15:41:24 +0000 |
---|---|---|
committer | David Baker <dbkr@users.noreply.github.com> | 2015-01-28 15:41:24 +0000 |
commit | fddc7a080afffee66f715234c535f11b94a4f411 (patch) | |
tree | efa2745186a2fde64cef7000f79d9e191d53dd13 /synapse/server.py | |
parent | Initial cut of a shared base class for REST unit tests (diff) | |
parent | Use %s instead of + (diff) | |
download | synapse-fddc7a080afffee66f715234c535f11b94a4f411.tar.xz |
Merge pull request #35 from matrix-org/pushers2
Pushers branch (with fixes)
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 f09d5d581e..f152f0321e 100644 --- a/synapse/server.py +++ b/synapse/server.py @@ -31,6 +31,7 @@ from synapse.util.lockutils import LockManager from synapse.streams.events import EventSources from synapse.api.ratelimiting import Ratelimiter from synapse.crypto.keyring import Keyring +from synapse.push.pusherpool import PusherPool from synapse.events.builder import EventBuilderFactory @@ -78,6 +79,7 @@ class BaseHomeServer(object): 'event_sources', 'ratelimiter', 'keyring', + 'pusherpool', 'event_builder_factory', ] @@ -197,3 +199,6 @@ class HomeServer(BaseHomeServer): clock=self.get_clock(), hostname=self.hostname, ) + + def build_pusherpool(self): + return PusherPool(self) |