|
2 | 2 | // Use of this source code is governed by a MIT-style
|
3 | 3 | // license that can be found in the LICENSE file.
|
4 | 4 |
|
5 |
| -package log |
| 5 | +package models |
6 | 6 |
|
7 | 7 | import (
|
8 | 8 | "fmt"
|
9 | 9 |
|
| 10 | + "code.gitea.io/gitea/modules/log" |
| 11 | + |
10 | 12 | "github.com/go-xorm/core"
|
11 | 13 | )
|
12 | 14 |
|
13 | 15 | // XORMLogBridge a logger bridge from Logger to xorm
|
14 | 16 | type XORMLogBridge struct {
|
15 | 17 | showSQL bool
|
16 | 18 | level core.LogLevel
|
| 19 | + logger *log.Logger |
17 | 20 | }
|
18 | 21 |
|
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{ |
27 | 25 | showSQL: showSQL,
|
| 26 | + logger: log.GetLogger("xorm"), |
28 | 27 | }
|
29 | 28 | }
|
30 | 29 |
|
31 |
| -// GetGiteaLevel returns the minimum Gitea logger level |
32 |
| -func (l *XORMLogBridge) GetGiteaLevel() Level { |
33 |
| - return GetLogger("xorm").GetLevel() |
34 |
| -} |
35 |
| - |
36 | 30 | // 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...) |
39 | 33 | }
|
40 | 34 |
|
41 | 35 | // Debug show debug log
|
42 | 36 | func (l *XORMLogBridge) Debug(v ...interface{}) {
|
43 |
| - l.Log(2, DEBUG, fmt.Sprint(v...)) |
| 37 | + l.Log(2, log.DEBUG, fmt.Sprint(v...)) |
44 | 38 | }
|
45 | 39 |
|
46 | 40 | // Debugf show debug log
|
47 | 41 | func (l *XORMLogBridge) Debugf(format string, v ...interface{}) {
|
48 |
| - l.Log(2, DEBUG, format, v...) |
| 42 | + l.Log(2, log.DEBUG, format, v...) |
49 | 43 | }
|
50 | 44 |
|
51 | 45 | // Error show error log
|
52 | 46 | func (l *XORMLogBridge) Error(v ...interface{}) {
|
53 |
| - l.Log(2, ERROR, fmt.Sprint(v...)) |
| 47 | + l.Log(2, log.ERROR, fmt.Sprint(v...)) |
54 | 48 | }
|
55 | 49 |
|
56 | 50 | // Errorf show error log
|
57 | 51 | func (l *XORMLogBridge) Errorf(format string, v ...interface{}) {
|
58 |
| - l.Log(2, ERROR, format, v...) |
| 52 | + l.Log(2, log.ERROR, format, v...) |
59 | 53 | }
|
60 | 54 |
|
61 | 55 | // Info show information level log
|
62 | 56 | func (l *XORMLogBridge) Info(v ...interface{}) {
|
63 |
| - l.Log(2, INFO, fmt.Sprint(v...)) |
| 57 | + l.Log(2, log.INFO, fmt.Sprint(v...)) |
64 | 58 | }
|
65 | 59 |
|
66 | 60 | // Infof show information level log
|
67 | 61 | func (l *XORMLogBridge) Infof(format string, v ...interface{}) {
|
68 |
| - l.Log(2, INFO, format, v...) |
| 62 | + l.Log(2, log.INFO, format, v...) |
69 | 63 | }
|
70 | 64 |
|
71 | 65 | // Warn show warning log
|
72 | 66 | func (l *XORMLogBridge) Warn(v ...interface{}) {
|
73 |
| - l.Log(2, WARN, fmt.Sprint(v...)) |
| 67 | + l.Log(2, log.WARN, fmt.Sprint(v...)) |
74 | 68 | }
|
75 | 69 |
|
76 | 70 | // Warnf show warnning log
|
77 | 71 | func (l *XORMLogBridge) Warnf(format string, v ...interface{}) {
|
78 |
| - l.Log(2, WARN, format, v...) |
| 72 | + l.Log(2, log.WARN, format, v...) |
79 | 73 | }
|
80 | 74 |
|
81 | 75 | // Level get logger level
|
82 | 76 | 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: |
85 | 79 | return core.LOG_DEBUG
|
86 |
| - case INFO: |
| 80 | + case log.INFO: |
87 | 81 | return core.LOG_INFO
|
88 |
| - case WARN: |
| 82 | + case log.WARN: |
89 | 83 | return core.LOG_WARNING
|
90 |
| - case ERROR, CRITICAL: |
| 84 | + case log.ERROR, log.CRITICAL: |
91 | 85 | return core.LOG_ERR
|
92 | 86 | }
|
93 | 87 | return core.LOG_OFF
|
|
0 commit comments