diff options
author | Erik Johnston <erik@matrix.org> | 2016-08-12 10:03:19 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2016-08-12 10:03:19 +0100 |
commit | 866a5320de439ab2019251aa8f8697c74aeeef8c (patch) | |
tree | 3899f11327a29accd87e92b1149489aacefa2c44 /synapse/rest/client/v1/events.py | |
parent | Merge pull request #997 from Half-Shot/develop (diff) | |
download | synapse-866a5320de439ab2019251aa8f8697c74aeeef8c.tar.xz |
Dont invoke get_handlers fromClientV1RestServlet
hs.get_handlers() can not be invoked from split out processes. Moving the invocations down a level means that we can slowly split out individual servlets.
Diffstat (limited to 'synapse/rest/client/v1/events.py')
-rw-r--r-- | synapse/rest/client/v1/events.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/synapse/rest/client/v1/events.py b/synapse/rest/client/v1/events.py index 498bb9e18a..998b115bb9 100644 --- a/synapse/rest/client/v1/events.py +++ b/synapse/rest/client/v1/events.py @@ -32,6 +32,10 @@ class EventStreamRestServlet(ClientV1RestServlet): DEFAULT_LONGPOLL_TIME_MS = 30000 + def __init__(self, hs): + super(EventStreamRestServlet, self).__init__(hs) + self.handlers = hs.get_handlers() + @defer.inlineCallbacks def on_GET(self, request): requester = yield self.auth.get_user_by_req( |