Fix a connection leak (#902)

albix · web-flow · commit 68ea16786653 · 2023-09-05T22:07:37.000-04:00
The leak was introduced in PR#882

Signed-off-by: Christian Albrecht &lt;cal@albix.de&gt;
Co-authored-by: Christian Albrecht &lt;christian.albrecht@akquinet.de&gt;
diff --git a/collector/collector.go b/collector/collector.go
@@ -173,6 +173,7 @@ func (p PostgresCollector) Collect(ch chan<- prometheus.Metric) {
 		level.Error(p.logger).Log("msg", "Error opening connection to database", "err", err)
 		return
 	}
+	defer p.instance.Close()
 
 	wg := sync.WaitGroup{}
 	wg.Add(len(p.Collectors))
diff --git a/collector/probe.go b/collector/probe.go
@@ -81,6 +81,7 @@ func (pc *ProbeCollector) Collect(ch chan<- prometheus.Metric) {
 		level.Error(pc.logger).Log("msg", "Error opening connection to database", "err", err)
 		return
 	}
+	defer pc.instance.Close()
 
 	wg := sync.WaitGroup{}
 	wg.Add(len(pc.collectors))

Original file line number	Diff line number	Diff line change
`@@ -173,6 +173,7 @@ func (p PostgresCollector) Collect(ch chan<- prometheus.Metric) {`
`173`	`173`	`level.Error(p.logger).Log("msg", "Error opening connection to database", "err", err)`
`174`	`174`	`return`
`175`	`175`	`}`
	`176`	`+ defer p.instance.Close()`
`176`	`177`
`177`	`178`	`wg := sync.WaitGroup{}`
`178`	`179`	`wg.Add(len(p.Collectors))`
Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,7 @@ func (pc *ProbeCollector) Collect(ch chan<- prometheus.Metric) {`
`81`	`81`	`level.Error(pc.logger).Log("msg", "Error opening connection to database", "err", err)`
`82`	`82`	`return`
`83`	`83`	`}`
	`84`	`+ defer pc.instance.Close()`
`84`	`85`
`85`	`86`	`wg := sync.WaitGroup{}`
`86`	`87`	`wg.Add(len(pc.collectors))`