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 /mediaapi/storage/postgres/storage.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 'mediaapi/storage/postgres/storage.go')
-rw-r--r-- | mediaapi/storage/postgres/storage.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mediaapi/storage/postgres/storage.go b/mediaapi/storage/postgres/storage.go index 18126b15..4ddfc8fd 100644 --- a/mediaapi/storage/postgres/storage.go +++ b/mediaapi/storage/postgres/storage.go @@ -21,6 +21,7 @@ import ( // Import the postgres database driver. _ "github.com/lib/pq" + "github.com/matrix-org/dendrite/common" "github.com/matrix-org/dendrite/internal/sqlutil" "github.com/matrix-org/dendrite/mediaapi/types" "github.com/matrix-org/gomatrixserverlib" @@ -33,10 +34,10 @@ type Database struct { } // Open opens a postgres database. -func Open(dataSourceName string) (*Database, error) { +func Open(dataSourceName string, dbProperties common.DbProperties) (*Database, error) { var d Database var err error - if d.db, err = sqlutil.Open("postgres", dataSourceName); err != nil { + if d.db, err = sqlutil.Open("postgres", dataSourceName, dbProperties); err != nil { return nil, err } if err = d.statements.prepare(d.db); err != nil { |