Skip to content

Commit 978cf48

Browse files
committed
add the error log to indicate which oracle dsn
1 parent a0ab3a3 commit 978cf48

File tree

6 files changed

+12
-55
lines changed

6 files changed

+12
-55
lines changed

.devcontainer/devcontainer.json

+6-7
Original file line numberDiff line numberDiff line change
@@ -13,27 +13,26 @@
1313
"NODE_VERSION": "none"
1414
}
1515
},
16-
"runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" ],
17-
16+
"runArgs": [
17+
"--cap-add=SYS_PTRACE",
18+
"--security-opt",
19+
"seccomp=unconfined"
20+
],
1821
// Set *default* container specific settings.json values on container create.
1922
"settings": {
2023
"go.toolsManagement.checkForUpdates": "local",
2124
"go.useLanguageServer": true,
2225
"go.gopath": "/go",
2326
"go.goroot": "/usr/local/go"
2427
},
25-
2628
// Add the IDs of extensions you want installed when the container is created.
2729
"extensions": [
2830
"golang.Go"
2931
],
30-
3132
// Use 'forwardPorts' to make a list of ports inside the container available locally.
3233
// "forwardPorts": [],
33-
3434
// Use 'postCreateCommand' to run commands after the container is created.
3535
// "postCreateCommand": "go version",
36-
3736
// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
3837
"remoteUser": "vscode"
39-
}
38+
}

.devcontainer1/Dockerfile

-9
This file was deleted.

.devcontainer1/devcontainer.json

-34
This file was deleted.

main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ type Exporter struct {
8080
func NewExporter(collects []string, dsn string, logger log.Logger) *Exporter {
8181
return &Exporter{
8282
logger: logger,
83-
md: MultiDatabase{Addr: *multidatabaseAddr, Dsn: dsn},
83+
md: MultiDatabase{addr: *multidatabaseAddr, dsn: dsn},
8484
collects: collects,
8585
mp: MetricProcessor{logger: logger},
8686
duration: prometheus.NewGauge(prometheus.GaugeOpts{

mdb.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99
)
1010

1111
type MultiDatabase struct {
12-
Addr string
13-
Dsn string
12+
addr string
13+
dsn string
1414
}
1515

1616
type MultiDatabaseRequest struct {
@@ -32,13 +32,13 @@ func (md MultiDatabase) Ping() error {
3232
}
3333

3434
func (md MultiDatabase) Query(sqlText string) ([]map[string]interface{}, error) {
35-
json_data, err := json.Marshal(MultiDatabaseRequest{md.Dsn, sqlText, []interface{}{}})
35+
json_data, err := json.Marshal(MultiDatabaseRequest{md.dsn, sqlText, []interface{}{}})
3636

3737
if err != nil {
3838
return nil, err
3939
}
4040

41-
url := fmt.Sprintf("http://%s/query", md.Addr)
41+
url := fmt.Sprintf("http://%s/query", md.addr)
4242
// resp, err := http.Post(url, "application/json",
4343
// bytes.NewBuffer(json_data))
4444
req, err := http.NewRequest("POST", url, bytes.NewBuffer(json_data))

mp.go

+1
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@ func (mp MetricProcessor) GeneratePrometheusMetrics(parse func(row map[string]st
150150
// }
151151

152152
if err != nil {
153+
level.Error(mp.logger).Log("Error for oracle query: ", md.dsn, err)
153154
return err
154155
}
155156

0 commit comments

Comments
 (0)