diff options
| author | David Baker <dave@matrix.org> | 2017-04-21 11:35:52 +0100 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2017-04-21 11:35:52 +0100 |
| commit | 2e165295b7a6af244c9d9b364d9a68e6d53dbadf (patch) | |
| tree | 19faaf5edaefd3020cf2954cb090f378b5e9819f /synapse/server.py | |
| parent | Propagate errors sensibly from proxied IS requests (diff) | |
| parent | m.read_marker -> m.fully_read (#2128) (diff) | |
| download | synapse-2e165295b7a6af244c9d9b364d9a68e6d53dbadf.tar.xz | |
Merge remote-tracking branch 'origin/develop' into dbkr/http_request_propagate_error
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 f73aef19c8..8325d77a7a 100644 --- a/synapse/server.py +++ b/synapse/server.py @@ -48,6 +48,7 @@ from synapse.handlers.typing import TypingHandler from synapse.handlers.events import EventHandler, EventStreamHandler from synapse.handlers.initial_sync import InitialSyncHandler from synapse.handlers.receipts import ReceiptsHandler +from synapse.handlers.read_marker import ReadMarkerHandler from synapse.http.client import ( SimpleHttpClient, InsecureInterceptableContextFactory, MatrixProxyClient ) @@ -136,6 +137,7 @@ class HomeServer(object): 'receipts_handler', 'macaroon_generator', 'tcp_replication', + 'read_marker_handler', ] def __init__(self, hostname, **kwargs): @@ -297,6 +299,9 @@ class HomeServer(object): def build_receipts_handler(self): return ReceiptsHandler(self) + def build_read_marker_handler(self): + return ReadMarkerHandler(self) + def build_tcp_replication(self): raise NotImplementedError() |