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/directory.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/directory.py')
| -rw-r--r-- | synapse/rest/client/v1/directory.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/synapse/rest/client/v1/directory.py b/synapse/rest/client/v1/directory.py index 8ac09419dc..09d0831594 100644 --- a/synapse/rest/client/v1/directory.py +++ b/synapse/rest/client/v1/directory.py @@ -36,6 +36,10 @@ def register_servlets(hs, http_server): class ClientDirectoryServer(ClientV1RestServlet): PATTERNS = client_path_patterns("/directory/room/(?P<room_alias>[^/]*)$") + def __init__(self, hs): + super(ClientDirectoryServer, self).__init__(hs) + self.handlers = hs.get_handlers() + @defer.inlineCallbacks def on_GET(self, request, room_alias): room_alias = RoomAlias.from_string(room_alias) @@ -146,6 +150,7 @@ class ClientDirectoryListServer(ClientV1RestServlet): def __init__(self, hs): super(ClientDirectoryListServer, self).__init__(hs) self.store = hs.get_datastore() + self.handlers = hs.get_handlers() @defer.inlineCallbacks def on_GET(self, request, room_id): |