Skip to content

Ensure database connections are always closed #1177

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

Merged
merged 2 commits into from
Jul 18, 2025
Merged

Ensure database connections are always closed #1177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
743b06f
Ensure database connections are always closed
dehaansa Oct 24, 2024
8bb0edd
Merge branch 'master' into fix/close-everything
dehaansa Jul 18, 2025
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
1 change: 1 addition & 0 deletions cmd/postgres_exporter/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,7 @@ func (s *Servers) GetServer(dsn string) (*Server, error) {
s.servers[dsn] = server
}
if err = server.Ping(); err != nil {
server.Close()
delete(s.servers, dsn)
time.Sleep(time.Duration(errCount) * time.Second)
continue
Expand Down
6 changes: 5 additions & 1 deletion collector/collector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,11 +173,11 @@ func (p PostgresCollector) Collect(ch chan<- prometheus.Metric) {

// Set up the database connection for the collector.
err := inst.setup()
defer inst.Close()
if err != nil {
p.logger.Error("Error opening connection to database", "err", err)
return
}
defer inst.Close()

wg := sync.WaitGroup{}
wg.Add(len(p.Collectors))
Expand All @@ -190,6 +190,10 @@ func (p PostgresCollector) Collect(ch chan<- prometheus.Metric) {
wg.Wait()
}

func (p *PostgresCollector) Close() error {
return p.instance.Close()
}

func execute(ctx context.Context, name string, c Collector, instance *instance, ch chan<- prometheus.Metric, logger *slog.Logger) {
begin := time.Now()
err := c.Update(ctx, instance, ch)
Expand Down
2 changes: 1 addition & 1 deletion collector/probe.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,11 @@ func (pc *ProbeCollector) Describe(ch chan<- *prometheus.Desc) {
func (pc *ProbeCollector) Collect(ch chan<- prometheus.Metric) {
// Set up the database connection for the collector.
err := pc.instance.setup()
defer pc.instance.Close()
if err != nil {
pc.logger.Error("Error opening connection to database", "err", err)
return
}
defer pc.instance.Close()

wg := sync.WaitGroup{}
wg.Add(len(pc.collectors))
Expand Down