Skip to content

fix: connection pool leak in StartClient (sqlstore.New opens unbounded pool every reconnect) #168

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
jefersonfborba wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: connection pool leak in StartClient (sqlstore.New opens unbounded pool every reconnect) #168

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
29 changes: 16 additions & 13 deletions pkg/whatsmeow/service/whatsmeow.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,21 +316,24 @@ func (w whatsmeowService) StartClient(cd *ClientData) {

var container *sqlstore.Container

var dbLog waLog.Logger
if w.config.WaDebug != "" {
dbLog := waLog.Stdout("Database", w.config.WaDebug, true)
if w.config.PostgresAuthDB != "" {
container, err = sqlstore.New(context.Background(), "postgres", w.config.PostgresAuthDB, dbLog)
} else {
dsn := fmt.Sprintf("file:%s/dbdata/main.db?_pragma=foreign_keys(1)&_busy_timeout=5000&cache=shared&mode=rwc&_journal_mode=WAL", w.exPath)
container, err = sqlstore.New(context.Background(), "sqlite", dsn, dbLog)
}
dbLog = waLog.Stdout("Database", w.config.WaDebug, true)
}

if w.config.PostgresAuthDB != "" {
// Reuse the shared, pool-limited connection (w.authDB, configured with
// SetMaxOpenConns/SetConnMaxIdleTime in initPostgresAuthDB) instead of
// opening a brand-new, unbounded Postgres connection pool on every call.
// sqlstore.New() calls sql.Open() internally, and the resulting
// container was never closed here — every reconnect (disconnect retry,
// session check, API ConnectInstance) leaked one idle connection that
// accumulated for days until the shared Postgres pool was exhausted.
container = sqlstore.NewWithDB(w.authDB, "postgres", dbLog)
err = container.Upgrade(context.Background()) // NewWithDB skips the auto-upgrade New() does
} else {
if w.config.PostgresAuthDB != "" {
container, err = sqlstore.New(context.Background(), "postgres", w.config.PostgresAuthDB, nil)
} else {
dsn := fmt.Sprintf("file:%s/dbdata/main.db?_pragma=foreign_keys(1)&_busy_timeout=5000&cache=shared&mode=rwc&_journal_mode=WAL", w.exPath)
container, err = sqlstore.New(context.Background(), "sqlite", dsn, nil)
}
dsn := fmt.Sprintf("file:%s/dbdata/main.db?_pragma=foreign_keys(1)&_busy_timeout=5000&cache=shared&mode=rwc&_journal_mode=WAL", w.exPath)
container, err = sqlstore.New(context.Background(), "sqlite", dsn, dbLog)
}

if err != nil {
Expand Down