|
@@ -158,10 +158,14 @@ func getEngine() (*xorm.Engine, error) {
|
|
|
} else {
|
|
} else {
|
|
|
engine.SetMaxOpenConns(DbCfg.MaxOpenConn)
|
|
engine.SetMaxOpenConns(DbCfg.MaxOpenConn)
|
|
|
engine.SetMaxIdleConns(DbCfg.MaxIdleConn)
|
|
engine.SetMaxIdleConns(DbCfg.MaxIdleConn)
|
|
|
- engine.SetLogger(&xorm.DiscardLogger{})
|
|
|
|
|
- // engine.SetLogger(NewXormLogger(log.LvlInfo, log.New("sqlstore.xorm")))
|
|
|
|
|
- // engine.ShowSQL = true
|
|
|
|
|
- // engine.ShowInfo = true
|
|
|
|
|
|
|
+ debugSql := setting.Cfg.Section("database").Key("debug").MustBool(false)
|
|
|
|
|
+ if !debugSql {
|
|
|
|
|
+ engine.SetLogger(&xorm.DiscardLogger{})
|
|
|
|
|
+ } else {
|
|
|
|
|
+ engine.SetLogger(NewXormLogger(log.LvlInfo, log.New("sqlstore.xorm")))
|
|
|
|
|
+ engine.ShowSQL(true)
|
|
|
|
|
+ engine.ShowExecTime(true)
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
return engine, nil
|
|
return engine, nil
|
|
|
}
|
|
}
|
|
@@ -190,12 +194,12 @@ func LoadConfig() {
|
|
|
DbCfg.Host = sec.Key("host").String()
|
|
DbCfg.Host = sec.Key("host").String()
|
|
|
DbCfg.Name = sec.Key("name").String()
|
|
DbCfg.Name = sec.Key("name").String()
|
|
|
DbCfg.User = sec.Key("user").String()
|
|
DbCfg.User = sec.Key("user").String()
|
|
|
- DbCfg.MaxOpenConn = sec.Key("max_open_conn").MustInt(0)
|
|
|
|
|
- DbCfg.MaxIdleConn = sec.Key("max_idle_conn").MustInt(0)
|
|
|
|
|
if len(DbCfg.Pwd) == 0 {
|
|
if len(DbCfg.Pwd) == 0 {
|
|
|
DbCfg.Pwd = sec.Key("password").String()
|
|
DbCfg.Pwd = sec.Key("password").String()
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
+ DbCfg.MaxOpenConn = sec.Key("max_open_conn").MustInt(0)
|
|
|
|
|
+ DbCfg.MaxIdleConn = sec.Key("max_idle_conn").MustInt(0)
|
|
|
|
|
|
|
|
if DbCfg.Type == "sqlite3" {
|
|
if DbCfg.Type == "sqlite3" {
|
|
|
UseSQLite3 = true
|
|
UseSQLite3 = true
|