Skip to content

Commit fa36e39

Browse files
easyCZroboquat
authored andcommitted
[usage] Log db with standard logger
1 parent 52ac5a5 commit fa36e39

File tree

1 file changed

+19
-1
lines changed

1 file changed

+19
-1
lines changed

components/usage/pkg/db/conn.go

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,13 @@ package db
66

77
import (
88
"fmt"
9+
"github.com/gitpod-io/gitpod/common-go/log"
910
driver_mysql "github.com/go-sql-driver/mysql"
11+
"github.com/sirupsen/logrus"
1012
"github.com/stretchr/testify/require"
1113
"gorm.io/driver/mysql"
1214
"gorm.io/gorm"
15+
"gorm.io/gorm/logger"
1316
"testing"
1417
"time"
1518
)
@@ -38,7 +41,22 @@ func Connect(p ConnectionParams) (*gorm.DB, error) {
3841
}
3942

4043
// refer to https://github.com/go-sql-driver/mysql#dsn-data-source-name for details
41-
return gorm.Open(mysql.Open(cfg.FormatDSN()), &gorm.Config{})
44+
return gorm.Open(mysql.Open(cfg.FormatDSN()), &gorm.Config{
45+
Logger: logger.New(log.Log, logger.Config{
46+
SlowThreshold: 200 * time.Millisecond,
47+
Colorful: false,
48+
LogLevel: (func() logger.LogLevel {
49+
switch log.Log.Level {
50+
case logrus.PanicLevel, logrus.FatalLevel, logrus.ErrorLevel:
51+
return logger.Error
52+
case logrus.WarnLevel:
53+
return logger.Warn
54+
default:
55+
return logger.Info
56+
}
57+
})(),
58+
}),
59+
})
4260
}
4361

4462
func ConnectForTests(t *testing.T) *gorm.DB {

0 commit comments

Comments
 (0)