preparing for merge

markxnelson · markxnelson · commit e7bfd7bf0b8a · 2024-01-16T14:17:21.000-05:00
Signed-off-by: Mark Nelson &lt;mark.x.nelson@oracle.com&gt;
diff --git a/collector/collector.go b/collector/collector.go
@@ -259,7 +259,6 @@ func (e *Exporter) scrape(ch chan<- prometheus.Metric) {
 		}
 	}(time.Now())
 
-	//level.Debug(e.logger).Log("msg", "first ping")
 	if err = e.db.Ping(); err != nil {
 		level.Debug(e.logger).Log("msg", "error = "+err.Error())
 		if strings.Contains(err.Error(), "sql: database is closed") {
@@ -271,7 +270,6 @@ func (e *Exporter) scrape(ch chan<- prometheus.Metric) {
 		}
 	}
 
-	//level.Debug(e.logger).Log("msg", "second ping")
 	if err = e.db.Ping(); err != nil {
 		level.Error(e.logger).Log("msg", "Error pinging oracle",
 			"error", err)

Original file line number	Diff line number	Diff line change
`@@ -259,7 +259,6 @@ func (e *Exporter) scrape(ch chan<- prometheus.Metric) {`
`259`	`259`	`}`
`260`	`260`	`}(time.Now())`
`261`	`261`
`262`		`- //level.Debug(e.logger).Log("msg", "first ping")`
`263`	`262`	`if err = e.db.Ping(); err != nil {`
`264`	`263`	`level.Debug(e.logger).Log("msg", "error = "+err.Error())`
`265`	`264`	`if strings.Contains(err.Error(), "sql: database is closed") {`
`@@ -271,7 +270,6 @@ func (e *Exporter) scrape(ch chan<- prometheus.Metric) {`
`271`	`270`	`}`
`272`	`271`	`}`
`273`	`272`
`274`		`- //level.Debug(e.logger).Log("msg", "second ping")`
`275`	`273`	`if err = e.db.Ping(); err != nil {`
`276`	`274`	`level.Error(e.logger).Log("msg", "Error pinging oracle",`
`277`	`275`	`"error", err)`