diff options
| author | Erik Johnston <erik@matrix.org> | 2019-12-12 10:37:56 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-12 10:37:56 +0000 |
| commit | b8e4b39b69562cc0377ada84682752c1ad5e949d (patch) | |
| tree | 009e2b01d37ddd86883f5ac04608d836217303c0 /synapse/app/admin_cmd.py | |
| parent | Add `include_event_in_state` to _get_state_for_room (#6521) (diff) | |
| parent | Add new config param to docstring and add types (diff) | |
| download | synapse-b8e4b39b69562cc0377ada84682752c1ad5e949d.tar.xz | |
Merge pull request #6511 from matrix-org/erikj/remove_db_config_from_apps
Move database config from apps into HomeServer object
Diffstat (limited to 'synapse/app/admin_cmd.py')
| -rw-r--r-- | synapse/app/admin_cmd.py | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/synapse/app/admin_cmd.py b/synapse/app/admin_cmd.py index 04751a6a5e..51a909419f 100644 --- a/synapse/app/admin_cmd.py +++ b/synapse/app/admin_cmd.py @@ -45,7 +45,6 @@ from synapse.replication.slave.storage.registration import SlavedRegistrationSto from synapse.replication.slave.storage.room import RoomStore from synapse.replication.tcp.client import ReplicationClientHandler from synapse.server import HomeServer -from synapse.storage.engines import create_engine from synapse.util.logcontext import LoggingContext from synapse.util.versionstring import get_version_string @@ -229,14 +228,10 @@ def start(config_options): synapse.events.USE_FROZEN_DICTS = config.use_frozen_dicts - database_engine = create_engine(config.database_config) - ss = AdminCmdServer( config.server_name, - db_config=config.database_config, config=config, version_string="Synapse/" + get_version_string(synapse), - database_engine=database_engine, ) setup_logging(ss, config, use_worker_options=True) |