diff options
| author | Neil Alexander <neilalexander@users.noreply.github.com> | 2022-05-03 16:35:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-03 16:35:06 +0100 |
| commit | 4ad5f9c982fe5dc9e306a9269621ead8c31248cf (patch) | |
| tree | 9eac975c1d7232b35ce4d0c7f658db3c2289f0ab /setup/config/config_mediaapi.go | |
| parent | 979a551f1e2aeb9f3417df5e52a7279230b7a3ba (diff) | |
Global database connection pool (for monolith mode) (#2411)
* Allow monolith components to share a single database pool
* Don't yell about missing connection strings
* Rename field
* Setup tweaks
* Fix panic
* Improve configuration checks
* Update config
* Fix lint errors
* Update comments
Diffstat (limited to 'setup/config/config_mediaapi.go')
| -rw-r--r-- | setup/config/config_mediaapi.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/setup/config/config_mediaapi.go b/setup/config/config_mediaapi.go index c85020d2..273de322 100644 --- a/setup/config/config_mediaapi.go +++ b/setup/config/config_mediaapi.go @@ -58,7 +58,9 @@ func (c *MediaAPI) Verify(configErrs *ConfigErrors, isMonolith bool) { if !isMonolith { checkURL(configErrs, "media_api.external_api.listen", string(c.ExternalAPI.Listen)) } - checkNotEmpty(configErrs, "media_api.database.connection_string", string(c.Database.ConnectionString)) + if c.Matrix.DatabaseOptions.ConnectionString == "" { + checkNotEmpty(configErrs, "media_api.database.connection_string", string(c.Database.ConnectionString)) + } checkNotEmpty(configErrs, "media_api.base_path", string(c.BasePath)) checkPositive(configErrs, "media_api.max_file_size_bytes", int64(c.MaxFileSizeBytes)) |