diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-11-04 16:01:00 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-11-04 16:01:00 +0000 |
| commit | 33b3e0404937452a079be36b1cb7951cc17d221b (patch) | |
| tree | 151b669f040baaaad81b4f79d2ccc619932595c1 /synapse/server.py | |
| parent | Remove more unused parameters (diff) | |
| parent | Merge pull request #346 from matrix-org/markjh/remove_lock_manager (diff) | |
| download | synapse-33b3e0404937452a079be36b1cb7951cc17d221b.tar.xz | |
Merge branch 'develop' into daniel/removesomelies
Conflicts: synapse/notifier.py
Diffstat (limited to '')
| -rw-r--r-- | synapse/server.py | 5 |
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() |