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/user_dir.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/user_dir.py')
| -rw-r--r-- | synapse/app/user_dir.py | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/synapse/app/user_dir.py b/synapse/app/user_dir.py index c01fb34a9b..1257098f92 100644 --- a/synapse/app/user_dir.py +++ b/synapse/app/user_dir.py @@ -44,7 +44,6 @@ from synapse.rest.client.v2_alpha import user_directory from synapse.server import HomeServer from synapse.storage.data_stores.main.user_directory import UserDirectoryStore from synapse.storage.database import Database -from synapse.storage.engines import create_engine from synapse.util.caches.stream_change_cache import StreamChangeCache from synapse.util.httpresourcetree import create_resource_tree from synapse.util.manhole import manhole @@ -200,8 +199,6 @@ def start(config_options): events.USE_FROZEN_DICTS = config.use_frozen_dicts - database_engine = create_engine(config.database_config) - if config.update_user_directory: sys.stderr.write( "\nThe update_user_directory must be disabled in the main synapse process" @@ -216,10 +213,8 @@ def start(config_options): ss = UserDirectoryServer( 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) |