Skip to content

fix: add db connection time limits & close where possible #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ccev wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: add db connection time limits & close where possible #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions db_store/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ func (cfg *DBConfig) AsDSN() string {
}

func (cfg *DBConfig) Validate() error {
_, err := sqlx.Connect("mysql", cfg.AsDSN())
return err
db, err := sqlx.Connect("mysql", cfg.AsDSN())
if err != nil {
return err
}
return db.Close()
}
3 changes: 3 additions & 0 deletions db_store/golbat.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package db_store

import (
"context"
"time"

"github.com/jmoiron/sqlx"
"github.com/paulmach/orb/geojson"
Expand Down Expand Up @@ -52,6 +53,8 @@ func NewGolbatDBStore(config DBConfig, logger *logrus.Logger) (*GolbatDBStore, e
}
db.SetMaxOpenConns(config.MaxPool)
db.SetMaxIdleConns(5)
db.SetConnMaxLifetime(5 * time.Minute)
db.SetConnMaxIdleTime(5 * time.Minute)

return &GolbatDBStore{
logger: logger,
Expand Down
3 changes: 3 additions & 0 deletions db_store/nests.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -579,6 +579,7 @@ func (st *NestsDBStore) Migrate(migratePath string) error {
if err != nil {
return fmt.Errorf("failed to connect to the DB: %w", err)
}
defer db.Close()

dbDriver, err := migrate_mysql.WithInstance(db, migrateConfig)
if err != nil {
Expand Down Expand Up @@ -691,6 +692,8 @@ func NewNestsDBStore(config DBConfig, logger *logrus.Logger) (*NestsDBStore, err

db.SetMaxOpenConns(config.MaxPool)
db.SetMaxIdleConns(5)
db.SetConnMaxLifetime(5 * time.Minute)
db.SetConnMaxIdleTime(5 * time.Minute)

return &NestsDBStore{
logger: logger,
Expand Down