Skip to content

Commit 8b36f01

Browse files
lunnylafriks
authored andcommitted
Move xorm logger bridge from log to models so that log module could be a standalone package (#6944)
* move xorm logger bridge from log to models so that log module could be a standalone package * fix tests * save logger on xorm log bridge
1 parent 0e057eb commit 8b36f01

File tree

3 files changed

+25
-35
lines changed

3 files changed

+25
-35
lines changed

modules/log/xorm.go renamed to models/log.go

Lines changed: 23 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2,92 +2,86 @@
22
// Use of this source code is governed by a MIT-style
33
// license that can be found in the LICENSE file.
44

5-
package log
5+
package models
66

77
import (
88
"fmt"
99

10+
"code.gitea.io/gitea/modules/log"
11+
1012
"github.com/go-xorm/core"
1113
)
1214

1315
// XORMLogBridge a logger bridge from Logger to xorm
1416
type XORMLogBridge struct {
1517
showSQL bool
1618
level core.LogLevel
19+
logger *log.Logger
1720
}
1821

19-
var (
20-
// XORMLogger the logger for xorm
21-
XORMLogger *XORMLogBridge
22-
)
23-
24-
// InitXORMLogger inits a log bridge for xorm
25-
func InitXORMLogger(showSQL bool) {
26-
XORMLogger = &XORMLogBridge{
22+
// NewXORMLogger inits a log bridge for xorm
23+
func NewXORMLogger(showSQL bool) core.ILogger {
24+
return &XORMLogBridge{
2725
showSQL: showSQL,
26+
logger: log.GetLogger("xorm"),
2827
}
2928
}
3029

31-
// GetGiteaLevel returns the minimum Gitea logger level
32-
func (l *XORMLogBridge) GetGiteaLevel() Level {
33-
return GetLogger("xorm").GetLevel()
34-
}
35-
3630
// Log a message with defined skip and at logging level
37-
func (l *XORMLogBridge) Log(skip int, level Level, format string, v ...interface{}) error {
38-
return GetLogger("xorm").Log(skip+1, level, format, v...)
31+
func (l *XORMLogBridge) Log(skip int, level log.Level, format string, v ...interface{}) error {
32+
return l.logger.Log(skip+1, level, format, v...)
3933
}
4034

4135
// Debug show debug log
4236
func (l *XORMLogBridge) Debug(v ...interface{}) {
43-
l.Log(2, DEBUG, fmt.Sprint(v...))
37+
l.Log(2, log.DEBUG, fmt.Sprint(v...))
4438
}
4539

4640
// Debugf show debug log
4741
func (l *XORMLogBridge) Debugf(format string, v ...interface{}) {
48-
l.Log(2, DEBUG, format, v...)
42+
l.Log(2, log.DEBUG, format, v...)
4943
}
5044

5145
// Error show error log
5246
func (l *XORMLogBridge) Error(v ...interface{}) {
53-
l.Log(2, ERROR, fmt.Sprint(v...))
47+
l.Log(2, log.ERROR, fmt.Sprint(v...))
5448
}
5549

5650
// Errorf show error log
5751
func (l *XORMLogBridge) Errorf(format string, v ...interface{}) {
58-
l.Log(2, ERROR, format, v...)
52+
l.Log(2, log.ERROR, format, v...)
5953
}
6054

6155
// Info show information level log
6256
func (l *XORMLogBridge) Info(v ...interface{}) {
63-
l.Log(2, INFO, fmt.Sprint(v...))
57+
l.Log(2, log.INFO, fmt.Sprint(v...))
6458
}
6559

6660
// Infof show information level log
6761
func (l *XORMLogBridge) Infof(format string, v ...interface{}) {
68-
l.Log(2, INFO, format, v...)
62+
l.Log(2, log.INFO, format, v...)
6963
}
7064

7165
// Warn show warning log
7266
func (l *XORMLogBridge) Warn(v ...interface{}) {
73-
l.Log(2, WARN, fmt.Sprint(v...))
67+
l.Log(2, log.WARN, fmt.Sprint(v...))
7468
}
7569

7670
// Warnf show warnning log
7771
func (l *XORMLogBridge) Warnf(format string, v ...interface{}) {
78-
l.Log(2, WARN, format, v...)
72+
l.Log(2, log.WARN, format, v...)
7973
}
8074

8175
// Level get logger level
8276
func (l *XORMLogBridge) Level() core.LogLevel {
83-
switch l.GetGiteaLevel() {
84-
case TRACE, DEBUG:
77+
switch l.logger.GetLevel() {
78+
case log.TRACE, log.DEBUG:
8579
return core.LOG_DEBUG
86-
case INFO:
80+
case log.INFO:
8781
return core.LOG_INFO
88-
case WARN:
82+
case log.WARN:
8983
return core.LOG_WARNING
90-
case ERROR, CRITICAL:
84+
case log.ERROR, log.CRITICAL:
9185
return core.LOG_ERR
9286
}
9387
return core.LOG_OFF

models/models.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import (
1515
"path/filepath"
1616
"strings"
1717

18-
"code.gitea.io/gitea/modules/log"
1918
"code.gitea.io/gitea/modules/setting"
2019

2120
// Needed for the MySQL driver
@@ -261,7 +260,7 @@ func NewTestEngine(x *xorm.Engine) (err error) {
261260
}
262261

263262
x.SetMapper(core.GonicMapper{})
264-
x.SetLogger(log.XORMLogger)
263+
x.SetLogger(NewXORMLogger(!setting.ProdMode))
265264
x.ShowSQL(!setting.ProdMode)
266265
return x.StoreEngine("InnoDB").Sync2(tables...)
267266
}
@@ -276,7 +275,7 @@ func SetEngine() (err error) {
276275
x.SetMapper(core.GonicMapper{})
277276
// WARNING: for serv command, MUST remove the output to os.stdout,
278277
// so use log file to instead print to stdout.
279-
x.SetLogger(log.XORMLogger)
278+
x.SetLogger(NewXORMLogger(setting.LogSQL))
280279
x.ShowSQL(setting.LogSQL)
281280
return nil
282281
}

modules/setting/log.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -295,8 +295,5 @@ func NewXORMLogService(disableConsole bool) {
295295

296296
Cfg.Section("log").Key("XORM").MustString(",")
297297
generateNamedLogger("xorm", options)
298-
log.InitXORMLogger(LogSQL)
299-
} else {
300-
log.InitXORMLogger(false)
301298
}
302299
}

0 commit comments

Comments
 (0)