diff options
| author | Patrick Cloke <clokep@users.noreply.github.com> | 2021-09-13 13:07:12 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-13 13:07:12 -0400 |
| commit | 01c88a09cd6e90fa28c1282a56a08e481727ce20 (patch) | |
| tree | d5875f6291b512163d2e01da2150dd4d0956aa7d /synapse/storage/prepare_database.py | |
| parent | Fix copy-paste error in the password section of the sample-config. (#10804) (diff) | |
| download | synapse-01c88a09cd6e90fa28c1282a56a08e481727ce20.tar.xz | |
Use direct references for some configuration variables (#10798)
Instead of proxying through the magic getter of the RootConfig object. This should be more performant (and is more explicit).
Diffstat (limited to 'synapse/storage/prepare_database.py')
| -rw-r--r-- | synapse/storage/prepare_database.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/storage/prepare_database.py b/synapse/storage/prepare_database.py index 61392b9639..d4754c904c 100644 --- a/synapse/storage/prepare_database.py +++ b/synapse/storage/prepare_database.py @@ -134,7 +134,7 @@ def prepare_database( # if it's a worker app, refuse to upgrade the database, to avoid multiple # workers doing it at once. if ( - config.worker_app is not None + config.worker.worker_app is not None and version_info.current_version != SCHEMA_VERSION ): raise UpgradeDatabaseException( @@ -154,7 +154,7 @@ def prepare_database( # if it's a worker app, refuse to upgrade the database, to avoid multiple # workers doing it at once. - if config and config.worker_app is not None: + if config and config.worker.worker_app is not None: raise UpgradeDatabaseException(EMPTY_DATABASE_ON_WORKER_ERROR) _setup_new_database(cur, database_engine, databases=databases) @@ -355,7 +355,7 @@ def _upgrade_existing_database( else: assert config - is_worker = config and config.worker_app is not None + is_worker = config and config.worker.worker_app is not None if ( current_schema_state.compat_version is not None |