HiPoweredDev
/
xorm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/cacher-tag

This commit is contained in:
Nash Tsai 2014-08-22 17:57:33 +08:00
parent e41af85ab4 64790ba262
commit 49b33f3e22
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
engine.go
View File

@ -38,7 +38,7 @@ type Engine struct {
ShowErr bool ShowErr bool
ShowDebug bool ShowDebug bool
ShowWarn bool ShowWarn bool
// -- // --227
Logger core.ILogger Logger core.ILogger
TZLocation *time.Location TZLocation *time.Location
@ -185,7 +185,7 @@ func (engine *Engine) Ping() error {
// logging sql // logging sql
func (engine *Engine) logSQL(sqlStr string, sqlArgs ...interface{}) { func (engine *Engine) logSQL(sqlStr string, sqlArgs ...interface{}) {
if engine.ShowSQL { if engine.ShowSQL {
overrideLogLevel(LOG_INFO) engine.overrideLogLevel(core.LOG_INFO)
if len(sqlArgs) > 0 { if len(sqlArgs) > 0 {
engine.Logger.Info(fmt.Sprintf("[sql] %v [args] %v", sqlStr, sqlArgs)) engine.Logger.Info(fmt.Sprintf("[sql] %v [args] %v", sqlStr, sqlArgs))
} else { } else {
@ -220,26 +220,25 @@ func (engine *Engine) LogSQLExecutionTime(sqlStr string, args interface{}, execu
// logging error // logging error
func (engine *Engine) overrideLogLevel(overrideLevel core.LogLevel) { func (engine *Engine) overrideLogLevel(overrideLevel core.LogLevel) {
logLevel := engine.Logger.Level() logLevel := engine.Logger.Level()
if logLevel == core.LOG_UNKNOWN { if logLevel == core.LOG_UNKNOWN {
// intend to left empty // intend to left empty
} } else if logLevel < overrideLevel { // TODO can remove if deprecated engine.ShowErr
else if logLevel < core.overrideLevel { // TODO can remove if deprecated engine.ShowErr engine.Logger.SetLevel(core.LOG_ERR) // try override logger's log level
engine.Logger.SetLevel(LOG_ERR) // try override logger's log level }
}
} }
func (engine *Engine) LogError(contents ...interface{}) { func (engine *Engine) LogError(contents ...interface{}) {
if engine.ShowErr { if engine.ShowErr {
overrideLogLevel(LOG_ERR) engine.overrideLogLevel(core.LOG_ERR)
engine.Logger.Err(contents...) engine.Logger.Err(contents...)
} }
} }
func (engine *Engine) LogErrorf(format string, contents ...interface{}) { func (engine *Engine) LogErrorf(format string, contents ...interface{}) {
if engine.ShowErr { if engine.ShowErr {
overrideLogLevel(LOG_ERR) engine.overrideLogLevel(core.LOG_ERR)
engine.Logger.Errf(format, contents...) engine.Logger.Errf(format, contents...)
} }
} }
@ -247,14 +246,14 @@ func (engine *Engine) LogErrorf(format string, contents ...interface{}) {
// logging info // logging info
func (engine *Engine) LogInfo(contents ...interface{}) { func (engine *Engine) LogInfo(contents ...interface{}) {
if engine.ShowInfo { if engine.ShowInfo {
overrideLogLevel(LOG_INFO) engine.overrideLogLevel(core.LOG_INFO)
engine.Logger.Info(contents...) engine.Logger.Info(contents...)
} }
} }
func (engine *Engine) LogInfof(format string, contents ...interface{}) { func (engine *Engine) LogInfof(format string, contents ...interface{}) {
if engine.ShowErr { if engine.ShowErr {
overrideLogLevel(LOG_INFO) engine.overrideLogLevel(core.LOG_INFO)
engine.Logger.Infof(format, contents...) engine.Logger.Infof(format, contents...)
} }
} }
@ -262,14 +261,14 @@ func (engine *Engine) LogInfof(format string, contents ...interface{}) {
// logging debug // logging debug
func (engine *Engine) LogDebug(contents ...interface{}) { func (engine *Engine) LogDebug(contents ...interface{}) {
if engine.ShowDebug { if engine.ShowDebug {
overrideLogLevel(LOG_DEBUG) engine.overrideLogLevel(core.LOG_DEBUG)
engine.Logger.Debug(contents...) engine.Logger.Debug(contents...)
} }
} }
func (engine *Engine) LogDebugf(format string, contents ...interface{}) { func (engine *Engine) LogDebugf(format string, contents ...interface{}) {
if engine.ShowDebug { if engine.ShowDebug {
overrideLogLevel(LOG_DEBUG) engine.overrideLogLevel(core.LOG_DEBUG)
engine.Logger.Debugf(format, contents...) engine.Logger.Debugf(format, contents...)
} }
} }
@ -277,14 +276,14 @@ func (engine *Engine) LogDebugf(format string, contents ...interface{}) {
// logging warn // logging warn
func (engine *Engine) LogWarn(contents ...interface{}) { func (engine *Engine) LogWarn(contents ...interface{}) {
if engine.ShowWarn { if engine.ShowWarn {
overrideLogLevel(LOG_WARNING) engine.overrideLogLevel(core.LOG_WARNING)
engine.Logger.Warning(contents...) engine.Logger.Warning(contents...)
} }
} }
func (engine *Engine) LogWarnf(format string, contents ...interface{}) { func (engine *Engine) LogWarnf(format string, contents ...interface{}) {
if engine.ShowWarn { if engine.ShowWarn {
overrideLogLevel(LOG_WARNING) engine.overrideLogLevel(core.LOG_WARNING)
engine.Logger.Warningf(format, contents...) engine.Logger.Warningf(format, contents...)
} }
} }