diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2019-05-14 15:04:07 +0800 |
|---|---|---|
| committer | Lauris BH <lauris@nix.lv> | 2019-05-14 10:04:07 +0300 |
| commit | 8b36f01f453979d6b6ee14f9ac6e56fa6c7b035e (patch) | |
| tree | b0f38d5a757aaaa10484241f85a77bf936084815 /models/models.go | |
| parent | 0e057eb0336629652ae8e661b1bd497007730334 (diff) | |
| download | gitea-8b36f01f453979d6b6ee14f9ac6e56fa6c7b035e.tar.gz gitea-8b36f01f453979d6b6ee14f9ac6e56fa6c7b035e.zip | |
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
Diffstat (limited to 'models/models.go')
| -rw-r--r-- | models/models.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/models/models.go b/models/models.go index 352c07e0c3..c7e58737ed 100644 --- a/models/models.go +++ b/models/models.go @@ -15,7 +15,6 @@ import ( "path/filepath" "strings" - "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" // Needed for the MySQL driver @@ -261,7 +260,7 @@ func NewTestEngine(x *xorm.Engine) (err error) { } x.SetMapper(core.GonicMapper{}) - x.SetLogger(log.XORMLogger) + x.SetLogger(NewXORMLogger(!setting.ProdMode)) x.ShowSQL(!setting.ProdMode) return x.StoreEngine("InnoDB").Sync2(tables...) } @@ -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(NewXORMLogger(setting.LogSQL)) x.ShowSQL(setting.LogSQL) return nil } |