Skip to content

Commit cc8a8b3

Browse files
committed
support logger
1 parent 8055d23 commit cc8a8b3

2 files changed

Lines changed: 7 additions & 8 deletions

File tree

go.sum

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ github.com/ClickHouse/ch-go v0.65.1 h1:SLuxmLl5Mjj44/XbINsK2HFvzqup0s6rwKLFH347Z
22
github.com/ClickHouse/ch-go v0.65.1/go.mod h1:bsodgURwmrkvkBe5jw1qnGDgyITsYErfONKAHn05nv4=
33
github.com/ClickHouse/clickhouse-go/v2 v2.34.0 h1:Y4rqkdrRHgExvC4o/NTbLdY5LFQ3LHS77/RNFxFX3Co=
44
github.com/ClickHouse/clickhouse-go/v2 v2.34.0/go.mod h1:yioSINoRLVZkLyDzdMXPLRIqhDvel8iLBlwh6Iefso8=
5-
github.com/DataBridgeTech/dbqcore v0.0.1 h1:ETqX/RXUDvD1XtK3Ld0DUZyxfweWbxDNA3Qgu/0cVgg=
6-
github.com/DataBridgeTech/dbqcore v0.0.1/go.mod h1:U2++eavpf8oSKxukSEJpKGfPaOtkApA7AUpzwkrXmVM=
75
github.com/andybalholm/brotli v1.1.1 h1:PR2pgnyFznKEugtsUo0xLdDop5SKXd5Qf5ysW+7XdTA=
86
github.com/andybalholm/brotli v1.1.1/go.mod h1:05ib4cKhjx3OQYUY22hTVd34Bc8upXjOLL2rKwwZBoA=
97
github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=

internal/app.go

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ func NewDbqCliApp(dbqConfigPath string) DbqCliApp {
5656
func (app *DbqAppImpl) PingDataSource(srcId string) (string, error) {
5757
var dataSource = app.FindDataSourceById(srcId)
5858

59-
cnn, err := getDbqConnector(*dataSource)
59+
cnn, err := getDbqConnector(*dataSource, app.logLevel)
6060
if err != nil {
6161
return "", err
6262
}
@@ -72,7 +72,7 @@ func (app *DbqAppImpl) PingDataSource(srcId string) (string, error) {
7272
func (app *DbqAppImpl) ImportDatasets(srcId string, filter string) ([]string, error) {
7373
var dataSource = app.FindDataSourceById(srcId)
7474

75-
cnn, err := getDbqConnector(*dataSource)
75+
cnn, err := getDbqConnector(*dataSource, app.logLevel)
7676
if err != nil {
7777
return []string{}, err
7878
}
@@ -83,7 +83,7 @@ func (app *DbqAppImpl) ImportDatasets(srcId string, filter string) ([]string, er
8383
func (app *DbqAppImpl) ProfileDataset(srcId string, dataset string, sample bool) (*dbqcore.TableMetrics, error) {
8484
var dataSource = app.FindDataSourceById(srcId)
8585

86-
cnn, err := getDbqConnector(*dataSource)
86+
cnn, err := getDbqConnector(*dataSource, app.logLevel)
8787
if err != nil {
8888
return nil, err
8989
}
@@ -119,7 +119,7 @@ func (app *DbqAppImpl) FindDataSourceById(srcId string) *dbqcore.DataSource {
119119
}
120120

121121
func (app *DbqAppImpl) RunCheck(check *dbqcore.Check, dataSource *dbqcore.DataSource, dataset string, defaultWhere string) (bool, string, error) {
122-
cnn, err := getDbqConnector(*dataSource)
122+
cnn, err := getDbqConnector(*dataSource, app.logLevel)
123123
if err != nil {
124124
return false, "", err
125125
}
@@ -156,11 +156,12 @@ func initConfig(dbqConfigPath string) (*dbqcore.DbqConfig, string) {
156156
return &dbqConfig, v.ConfigFileUsed()
157157
}
158158

159-
func getDbqConnector(ds dbqcore.DataSource) (dbqcore.DbqConnector, error) {
159+
func getDbqConnector(ds dbqcore.DataSource, logLevel slog.Level) (dbqcore.DbqConnector, error) {
160160
dsType := strings.ToLower(ds.Type)
161+
logHandler := slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{Level: logLevel})
161162
switch dsType {
162163
case "clickhouse":
163-
return dbqcore.NewClickhouseDbqConnector(ds)
164+
return dbqcore.NewClickhouseDbqConnector(ds, slog.New(logHandler))
164165
default:
165166
return nil, fmt.Errorf("data source type '%s' is not supported", dsType)
166167
}

0 commit comments

Comments
 (0)