summary refs log tree commit diff
path: root/synapse/handlers/__init__.py
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2018-07-24 10:43:30 +0100
committerGitHub <noreply@github.com>2018-07-24 10:43:30 +0100
commita6781450108f476c2c83d25a70e27f331e4c832e (patch)
tree2fbe0f15fe17c27664a6c4a7e0058e286bd6ed56 /synapse/handlers/__init__.py
parentanother couple of logcontext leaks (diff)
parentMerge pull request #3555 from matrix-org/erikj/client_apis_move (diff)
downloadsynapse-a6781450108f476c2c83d25a70e27f331e4c832e.tar.xz
Merge branch 'develop' into rav/logcontext_fixes
Diffstat (limited to 'synapse/handlers/__init__.py')
-rw-r--r--synapse/handlers/__init__.py4
1 files changed, 0 insertions, 4 deletions
diff --git a/synapse/handlers/__init__.py b/synapse/handlers/__init__.py
index 4b9923d8c0..413425fed1 100644
--- a/synapse/handlers/__init__.py
+++ b/synapse/handlers/__init__.py
@@ -17,9 +17,7 @@ from .admin import AdminHandler
 from .directory import DirectoryHandler
 from .federation import FederationHandler
 from .identity import IdentityHandler
-from .message import MessageHandler
 from .register import RegistrationHandler
-from .room import RoomContextHandler
 from .search import SearchHandler
 
 
@@ -44,10 +42,8 @@ class Handlers(object):
 
     def __init__(self, hs):
         self.registration_handler = RegistrationHandler(hs)
-        self.message_handler = MessageHandler(hs)
         self.federation_handler = FederationHandler(hs)
         self.directory_handler = DirectoryHandler(hs)
         self.admin_handler = AdminHandler(hs)
         self.identity_handler = IdentityHandler(hs)
         self.search_handler = SearchHandler(hs)
-        self.room_context_handler = RoomContextHandler(hs)