@@ -17,11 +17,7 @@ type GormWriter struct {
17
17
18
18
// Printf writes a log entry.
19
19
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 ... ))
25
21
}
26
22
27
23
// SetupGORM loads the ORM with the given configuration
@@ -45,7 +41,7 @@ func SetupGORM(config Config, logger observance.Logger) (*gorm.DB, error) {
45
41
return nil , fmt .Errorf ("failed to open DB connection: %w" , err )
46
42
}
47
43
48
- if config . Name != "" {
44
+ if dbName != "" {
49
45
// Ensure the DB exists.
50
46
db .Exec (fmt .Sprintf (config .createDatabaseQuery (), config .Name ))
51
47
err = Close (db )
@@ -89,19 +85,16 @@ func Close(db *gorm.DB) error {
89
85
return dbConn .Close ()
90
86
}
91
87
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
-
100
88
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
+ }
102
95
103
96
newLogger := gormlogger .New (
104
- GormWriter {},
97
+ GormWriter {Logger : logger },
105
98
gormlogger.Config {
106
99
SlowThreshold : 500 * time .Millisecond ,
107
100
LogLevel : logLevel ,
0 commit comments