aboutsummaryrefslogtreecommitdiff
path: root/cmd/dendrite-monolith-server/main.go
diff options
context:
space:
mode:
authorNeil Alexander <neilalexander@users.noreply.github.com>2020-05-01 13:34:53 +0100
committerGitHub <noreply@github.com>2020-05-01 13:34:53 +0100
commitf7cfa758864cc9849ce8b0539895283417b75eb0 (patch)
treefd75b5363172dacd7eab3b47c9a3ab1b7c4721bb /cmd/dendrite-monolith-server/main.go
parent908108c23e47df5fbf0d6629b676e105abd2a564 (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 'cmd/dendrite-monolith-server/main.go')
-rw-r--r--cmd/dendrite-monolith-server/main.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/dendrite-monolith-server/main.go b/cmd/dendrite-monolith-server/main.go
index 06001971..e004bc12 100644
--- a/cmd/dendrite-monolith-server/main.go
+++ b/cmd/dendrite-monolith-server/main.go
@@ -79,7 +79,7 @@ func main() {
eduProducer := producers.NewEDUServerProducer(eduInputAPI)
federationapi.SetupFederationAPIComponent(base, accountDB, deviceDB, federation, &keyRing, rsAPI, asAPI, fsAPI, eduProducer)
mediaapi.SetupMediaAPIComponent(base, deviceDB)
- publicRoomsDB, err := storage.NewPublicRoomsServerDatabase(string(base.Cfg.Database.PublicRoomsAPI))
+ publicRoomsDB, err := storage.NewPublicRoomsServerDatabase(string(base.Cfg.Database.PublicRoomsAPI), base.Cfg.DbProperties())
if err != nil {
logrus.WithError(err).Panicf("failed to connect to public rooms db")
}