p17860254
/
categraf
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix oracle plugin

This commit is contained in:
Ulric Qin 2022-07-26 13:37:25 +08:00
parent c33385103d
commit cba82cace6
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
inputs/oracle/oracle_linux_amd64.go
View File

@ -9,7 +9,6 @@ import (
"log" "log"
"strings" "strings"
"sync" "sync"
"sync/atomic"
"time" "time"
"flashcat.cloud/categraf/config" "flashcat.cloud/categraf/config"
@ -84,12 +83,13 @@ func (ins *Instance) Init() error {
connString := ins.getConnectionString() connString := ins.getConnectionString()
var err error var err error
client, err = sqlx.Open("godror", connString) ins.client, err = sqlx.Open("godror", connString)
if err != nil { if err != nil {
return fmt.Errorf("failed to open oracle connection: %v", err) return fmt.Errorf("failed to open oracle connection: %v", err)
} }
client.SetMaxOpenConns(ins.MaxOpenConnections) ins.client.SetMaxOpenConns(ins.MaxOpenConnections)
return nil
} }
func (ins *Instance) Drop() error { func (ins *Instance) Drop() error {
@ -97,9 +97,11 @@ func (ins *Instance) Drop() error {
log.Println("D! dropping oracle connection:", ins.Address) log.Println("D! dropping oracle connection:", ins.Address)
} }
if err := ins.Close(); err != nil { if err := ins.client.Close(); err != nil {
log.Println("E! failed to close oracle connection:", ins.Address, "error:", err) log.Println("E! failed to close oracle connection:", ins.Address, "error:", err)
} }
return nil
} }
func (ins *Instance) Gather(slist *types.SampleList) { func (ins *Instance) Gather(slist *types.SampleList) {
@ -119,8 +121,8 @@ func (ins *Instance) Gather(slist *types.SampleList) {
waitMetrics := new(sync.WaitGroup) waitMetrics := new(sync.WaitGroup)
for i := 0; i < len(o.Metrics); i++ { for i := 0; i < len(ins.Metrics); i++ {
m := o.Metrics[i] m := ins.Metrics[i]
waitMetrics.Add(1) waitMetrics.Add(1)
go ins.scrapeMetric(waitMetrics, slist, m, tags) go ins.scrapeMetric(waitMetrics, slist, m, tags)
} }
@ -141,7 +143,7 @@ func (ins *Instance) scrapeMetric(waitMetrics *sync.WaitGroup, slist *types.Samp
ctx, cancel := context.WithTimeout(context.Background(), timeout) ctx, cancel := context.WithTimeout(context.Background(), timeout)
defer cancel() defer cancel()
rows, err := client.QueryContext(ctx, metricConf.Request) rows, err := ins.client.QueryContext(ctx, metricConf.Request)
if ctx.Err() == context.DeadlineExceeded { if ctx.Err() == context.DeadlineExceeded {
log.Println("E! oracle query timeout, request:", metricConf.Request) log.Println("E! oracle query timeout, request:", metricConf.Request)