diff options
| author | Erik Johnston <erikj@jki.re> | 2017-05-19 13:42:49 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-19 13:42:49 +0100 |
| commit | 99713dc7d33a4f65e68e7a5b83c0b6cb346f41ac (patch) | |
| tree | 7dcbb8503bcf13dc2e9b74a642b5a7701a3023a9 /synapse/server.py | |
| parent | Don't push users who have left (diff) | |
| parent | Move invalidation cb to its own structure (diff) | |
| download | synapse-99713dc7d33a4f65e68e7a5b83c0b6cb346f41ac.tar.xz | |
Merge pull request #2234 from matrix-org/erikj/fix_push
Store ActionGenerator in HomeServer
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 12754c89ae..e400e278c6 100644 --- a/synapse/server.py +++ b/synapse/server.py @@ -52,6 +52,7 @@ from synapse.handlers.read_marker import ReadMarkerHandler from synapse.http.client import SimpleHttpClient, InsecureInterceptableContextFactory from synapse.http.matrixfederationclient import MatrixFederationHttpClient from synapse.notifier import Notifier +from synapse.push.action_generator import ActionGenerator from synapse.push.pusherpool import PusherPool from synapse.rest.media.v1.media_repository import MediaRepository from synapse.state import StateHandler @@ -135,6 +136,7 @@ class HomeServer(object): 'macaroon_generator', 'tcp_replication', 'read_marker_handler', + 'action_generator', ] def __init__(self, hostname, **kwargs): @@ -299,6 +301,9 @@ class HomeServer(object): def build_tcp_replication(self): raise NotImplementedError() + def build_action_generator(self): + return ActionGenerator(self) + def remove_pusher(self, app_id, push_key, user_id): return self.get_pusherpool().remove_pusher(app_id, push_key, user_id) |