Move xorm logger bridge from log to models so that log module could be a standalone package #6944
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…e a standalone package
zeripath
reviewed
May 14, 2019
models/log.go
Outdated
| func InitXORMLogger(showSQL bool) { | ||
| XORMLogger = &XORMLogBridge{ | ||
| // NeXORMLogger inits a log bridge for xorm | ||
| func NeXORMLogger(showSQL bool) core.ILogger { |
There was a problem hiding this comment.
Suggested change
| func NeXORMLogger(showSQL bool) core.ILogger { | |
| func NewXORMLogger(showSQL bool) core.ILogger { |
zeripath
reviewed
May 14, 2019
models/models.go
Outdated
| @@ -261,7 +260,7 @@ func NewTestEngine(x *xorm.Engine) (err error) { | |||
| } | |||
|
|
|||
| x.SetMapper(core.GonicMapper{}) | |||
| x.SetLogger(log.XORMLogger) | |||
| x.SetLogger(NeXORMLogger(!setting.ProdMode)) | |||
There was a problem hiding this comment.
Suggested change
| x.SetLogger(NeXORMLogger(!setting.ProdMode)) | |
| x.SetLogger(NewXORMLogger(!setting.ProdMode)) |
zeripath
reviewed
May 14, 2019
models/models.go
Outdated
| @@ -276,7 +275,7 @@ func SetEngine() (err error) { | |||
| x.SetMapper(core.GonicMapper{}) | |||
| // WARNING: for serv command, MUST remove the output to os.stdout, | |||
| // so use log file to instead print to stdout. | |||
| x.SetLogger(log.XORMLogger) | |||
| x.SetLogger(NeXORMLogger(setting.LogSQL)) | |||
There was a problem hiding this comment.
Suggested change
| x.SetLogger(NeXORMLogger(setting.LogSQL)) | |
| x.SetLogger(NewXORMLogger(setting.LogSQL)) |
zeripath
approved these changes
May 14, 2019
Codecov Report
@@ Coverage Diff @@
## master #6944 +/- ##
=========================================
+ Coverage 41.39% 41.4% +0.01%
=========================================
Files 441 441
Lines 59733 59729 -4
=========================================
+ Hits 24727 24732 +5
+ Misses 31767 31758 -9
Partials 3239 3239
Continue to review full report at Codecov.
|
lafriks
approved these changes
May 14, 2019
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
As title.