diff options
| author | Neil Alexander <neilalexander@users.noreply.github.com> | 2020-05-01 13:34:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-01 13:34:53 +0100 |
| commit | f7cfa758864cc9849ce8b0539895283417b75eb0 (patch) | |
| tree | fd75b5363172dacd7eab3b47c9a3ab1b7c4721bb /common/keydb/postgres/keydb.go | |
| parent | 908108c23e47df5fbf0d6629b676e105abd2a564 (diff) | |
Limit database connections (#980, #564) (#998)
* Limit database connections (#564)
- Add new options to the config file database:
max_open_conns: 100
max_idle_conns: 2
conn_max_lifetime: -1
- Implement connection parameter setup on the *DB (database/sql) in internal/sqlutil/trace.go:Open()
- Propagate the values in the form of DbProperties interface via all the
Open() and NewDatabase() functions
Signed-off-by: Tomas Jirka <tomas.jirka@email.cz>
* Fix wasm builds
* Remove file accidentally added from working tree
Co-authored-by: Tomas Jirka <tomas.jirka@email.cz>
Diffstat (limited to 'common/keydb/postgres/keydb.go')
| -rw-r--r-- | common/keydb/postgres/keydb.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/common/keydb/postgres/keydb.go b/common/keydb/postgres/keydb.go index 2879683e..6149d877 100644 --- a/common/keydb/postgres/keydb.go +++ b/common/keydb/postgres/keydb.go @@ -21,6 +21,7 @@ import ( "golang.org/x/crypto/ed25519" + "github.com/matrix-org/dendrite/common" "github.com/matrix-org/dendrite/internal/sqlutil" "github.com/matrix-org/gomatrixserverlib" ) @@ -37,11 +38,12 @@ type Database struct { // Returns an error if there was a problem talking to the database. func NewDatabase( dataSourceName string, + dbProperties common.DbProperties, serverName gomatrixserverlib.ServerName, serverKey ed25519.PublicKey, serverKeyID gomatrixserverlib.KeyID, ) (*Database, error) { - db, err := sqlutil.Open("postgres", dataSourceName) + db, err := sqlutil.Open("postgres", dataSourceName, dbProperties) if err != nil { return nil, err } |