mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-16 18:43:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Deleted code is good code

Browse source
This commit is contained in:
Till Faelligen 2023-03-17 09:52:56 +01:00
parent 22b9f67a18
commit fb120c3823
No known key found for this signature in database
GPG key ID: ACCDC9606D472758
1 changed files with 0 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
setup/base/base.go
View file

@ -17,7 +17,6 @@ package base
import ( import (
"bytes" "bytes"
"context" "context"
"database/sql"
"embed" "embed"
"encoding/json" "encoding/json"
"errors" "errors"
@ -191,24 +190,6 @@ func (b *BaseDendrite) Close() error {
return b.tracerCloser.Close() return b.tracerCloser.Close()
} }
// DatabaseConnection assists in setting up a database connection. It accepts
// the database properties and a new writer for the given component. If we're
// running in monolith mode with a global connection pool configured then we
// will return that connection, along with the global writer, effectively
// ignoring the options provided. Otherwise we'll open a new database connection
// using the supplied options and writer. Note that it's possible for the pointer
// receiver to be nil here – that's deliberate as some of the unit tests don't
// have a BaseDendrite and just want a connection with the supplied config
// without any pooling stuff.
func (b *BaseDendrite) DatabaseConnection(dbProperties *config.DatabaseOptions, writer sqlutil.Writer) (*sql.DB, sqlutil.Writer, error) {
logrus.Infof("%#v", dbProperties)
if dbProperties.ConnectionString != "" || b == nil {
cm := sqlutil.NewConnectionManager()
return cm.Connection(dbProperties)
}
return b.ConnectionManager.Connection(dbProperties)
}
// CreateClient creates a new client (normally used for media fetch requests). // CreateClient creates a new client (normally used for media fetch requests).
// Should only be called once per component. // Should only be called once per component.
func (b *BaseDendrite) CreateClient() *gomatrixserverlib.Client { func (b *BaseDendrite) CreateClient() *gomatrixserverlib.Client {