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/media_repository.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/media_repository.py')
| -rw-r--r-- | synapse/app/media_repository.py | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/synapse/app/media_repository.py b/synapse/app/media_repository.py index 2c6dd3ef02..4c80f257e2 100644 --- a/synapse/app/media_repository.py +++ b/synapse/app/media_repository.py @@ -40,7 +40,6 @@ from synapse.rest.admin import register_servlets_for_media_repo from synapse.rest.media.v0.content_repository import ContentRepoResource from synapse.server import HomeServer from synapse.storage.data_stores.main.media_repository import MediaRepositoryStore -from synapse.storage.engines import create_engine from synapse.util.httpresourcetree import create_resource_tree from synapse.util.manhole import manhole from synapse.util.versionstring import get_version_string @@ -157,14 +156,10 @@ def start(config_options): events.USE_FROZEN_DICTS = config.use_frozen_dicts - database_engine = create_engine(config.database_config) - ss = MediaRepositoryServer( 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) |