summary refs log tree commit diff
path: root/synapse/server.py
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2015-11-04 15:49:45 +0000
committerMark Haines <mjark@negativecurvature.net>2015-11-04 15:49:45 +0000
commit23cfd32e646de9d208e2220afb2dcf238ccf580b (patch)
treeb3e4acde4a96daedd86ea120d2f8e92d23fbb8d3 /synapse/server.py
parentMerge pull request #341 from matrix-org/markjh/v2_sync_receipts (diff)
parentRemove the LockManager class because it wasn't being used (diff)
downloadsynapse-23cfd32e646de9d208e2220afb2dcf238ccf580b.tar.xz
Merge pull request #346 from matrix-org/markjh/remove_lock_manager
Remove the LockManager class because it wasn't being used
Diffstat (limited to 'synapse/server.py')
-rw-r--r--synapse/server.py5
1 files changed, 0 insertions, 5 deletions
diff --git a/synapse/server.py b/synapse/server.py
index 8424798b1b..f75d5358b2 100644
--- a/synapse/server.py
+++ b/synapse/server.py
@@ -29,7 +29,6 @@ from synapse.state import StateHandler
 from synapse.storage import DataStore
 from synapse.util import Clock
 from synapse.util.distributor import Distributor
-from synapse.util.lockutils import LockManager
 from synapse.streams.events import EventSources
 from synapse.api.ratelimiting import Ratelimiter
 from synapse.crypto.keyring import Keyring
@@ -70,7 +69,6 @@ class BaseHomeServer(object):
         'auth',
         'rest_servlet_factory',
         'state_handler',
-        'room_lock_manager',
         'notifier',
         'distributor',
         'resource_for_client',
@@ -201,9 +199,6 @@ class HomeServer(BaseHomeServer):
     def build_state_handler(self):
         return StateHandler(self)
 
-    def build_room_lock_manager(self):
-        return LockManager()
-
     def build_distributor(self):
         return Distributor()