Skip to content

Commit 7f96c5f

Browse files
committed
fix gorm logger
1 parent 8643a49 commit 7f96c5f

File tree

1 file changed

+9
-16
lines changed

1 file changed

+9
-16
lines changed

database/gorm.go

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,7 @@ type GormWriter struct {
1717

1818
// Printf writes a log entry.
1919
func (g GormWriter) Printf(msg string, data ...interface{}) {
20-
fullMsg := msg
21-
for _, entry := range data {
22-
msg += fmt.Sprintf(", %+v", entry)
23-
}
24-
g.Logger.Info(fullMsg)
20+
g.Logger.Debug(fmt.Sprintf(msg, data...))
2521
}
2622

2723
// SetupGORM loads the ORM with the given configuration
@@ -45,7 +41,7 @@ func SetupGORM(config Config, logger observance.Logger) (*gorm.DB, error) {
4541
return nil, fmt.Errorf("failed to open DB connection: %w", err)
4642
}
4743

48-
if config.Name != "" {
44+
if dbName != "" {
4945
// Ensure the DB exists.
5046
db.Exec(fmt.Sprintf(config.createDatabaseQuery(), config.Name))
5147
err = Close(db)
@@ -89,19 +85,16 @@ func Close(db *gorm.DB) error {
8985
return dbConn.Close()
9086
}
9187

92-
var stringToGormLogLevel = map[string]gormlogger.LogLevel{
93-
"trace": gormlogger.Info,
94-
"debug": gormlogger.Info,
95-
"info": gormlogger.Info,
96-
"warn": gormlogger.Warn,
97-
"error": gormlogger.Error,
98-
}
99-
10088
func createLogger(logger observance.Logger) gormlogger.Interface {
101-
logLevel := stringToGormLogLevel[logger.Level()]
89+
var logLevel gormlogger.LogLevel
90+
if logger.Level() == "debug" || logger.Level() == "trace" {
91+
logLevel = gormlogger.Info
92+
} else {
93+
logLevel = gormlogger.Silent
94+
}
10295

10396
newLogger := gormlogger.New(
104-
GormWriter{},
97+
GormWriter{Logger: logger},
10598
gormlogger.Config{
10699
SlowThreshold: 500 * time.Millisecond,
107100
LogLevel: logLevel,

0 commit comments

Comments
 (0)