mirror of
https://github.com/go-gitea/gitea
synced 2025-07-22 18:28:37 +00:00
Make Xorm log configurable (#174)
* make xorm log configable * bug fixed for other sub commands except web * rebase and fix xorm log * bug fix for TrimSpace
This commit is contained in:
@@ -25,6 +25,7 @@ import (
|
||||
_ "github.com/denisenkom/go-mssqldb"
|
||||
|
||||
"code.gitea.io/gitea/models/migrations"
|
||||
"code.gitea.io/gitea/modules/log"
|
||||
"code.gitea.io/gitea/modules/setting"
|
||||
)
|
||||
|
||||
@@ -226,6 +227,7 @@ func getEngine() (*xorm.Engine, error) {
|
||||
default:
|
||||
return nil, fmt.Errorf("Unknown database type: %s", DbCfg.Type)
|
||||
}
|
||||
|
||||
return xorm.NewEngine(DbCfg.Type, connStr)
|
||||
}
|
||||
|
||||
@@ -236,6 +238,8 @@ func NewTestEngine(x *xorm.Engine) (err error) {
|
||||
return fmt.Errorf("Connect to database: %v", err)
|
||||
}
|
||||
|
||||
setting.NewXORMLogService(false)
|
||||
|
||||
x.SetMapper(core.GonicMapper{})
|
||||
return x.StoreEngine("InnoDB").Sync2(tables...)
|
||||
}
|
||||
@@ -248,20 +252,9 @@ 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.
|
||||
logPath := path.Join(setting.LogRootPath, "xorm.log")
|
||||
|
||||
if err := os.MkdirAll(path.Dir(logPath), os.ModePerm); err != nil {
|
||||
return fmt.Errorf("Failed to create dir %s: %v", logPath, err)
|
||||
}
|
||||
|
||||
f, err := os.Create(logPath)
|
||||
if err != nil {
|
||||
return fmt.Errorf("Failed to create xorm.log: %v", err)
|
||||
}
|
||||
x.SetLogger(xorm.NewSimpleLogger(f))
|
||||
x.SetLogger(log.XORMLogger)
|
||||
x.ShowSQL(true)
|
||||
return nil
|
||||
}
|
||||
|
Reference in New Issue
Block a user