sigb.us/dendrite
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases 1 Wiki Activity

Fix bug in database global setup

Browse source
This commit is contained in:
Neil Alexander 2022-05-03 17:40:56 +01:00
parent e01d1e1f5b
commit b0a9e85c4a
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
setup/base/base.go
View file

@ -201,7 +201,8 @@ func NewBaseDendrite(cfg *config.Dendrite, componentName string, options ...Base
if cfg.Global.DatabaseOptions.ConnectionString.IsSQLite() { if cfg.Global.DatabaseOptions.ConnectionString.IsSQLite() {
logrus.Panic("Using a global database connection pool is not supported with SQLite databases") logrus.Panic("Using a global database connection pool is not supported with SQLite databases")
} }
if db, err = sqlutil.Open(&cfg.Global.DatabaseOptions, sqlutil.NewDummyWriter()); err != nil { writer = sqlutil.NewDummyWriter()
if db, err = sqlutil.Open(&cfg.Global.DatabaseOptions, writer); err != nil {
logrus.WithError(err).Panic("Failed to set up global database connections") logrus.WithError(err).Panic("Failed to set up global database connections")
} }
logrus.Debug("Using global database connection pool") logrus.Debug("Using global database connection pool")