diff --git a/engine.go b/engine.go index 6ab7d465..bf041410 100644 --- a/engine.go +++ b/engine.go @@ -175,9 +175,9 @@ func (engine *Engine) Ping() error { func (engine *Engine) logSQL(sqlStr string, sqlArgs ...interface{}) { if engine.ShowSQL { if len(sqlArgs) > 0 { - engine.Logger.Info(fmt.Sprintln("[sql]", sqlStr, "[args]", sqlArgs)) + engine.Logger.Info(fmt.Sprintf("[sql] %v [args] %v", sqlStr, sqlArgs)) } else { - engine.Logger.Info(fmt.Sprintln("[sql]", sqlStr)) + engine.Logger.Info(fmt.Sprintf("[sql] %v", sqlStr)) } } } diff --git a/logger.go b/logger.go index 29aa7632..f9d529a1 100644 --- a/logger.go +++ b/logger.go @@ -3,7 +3,6 @@ package xorm import ( "fmt" "io" - "io/ioutil" "log" ) @@ -24,19 +23,19 @@ type SimpleLogger struct { func NewSimpleLogger(out io.Writer) *SimpleLogger { return &SimpleLogger{ - DEBUG: log.New(ioutil.Discard, "[xorm] [debug] ", log.Ldate|log.Lmicroseconds), - ERR: log.New(ioutil.Discard, "[xorm] [error] ", log.Ldate|log.Lmicroseconds), - INFO: log.New(ioutil.Discard, "[xorm] [info] ", log.Ldate|log.Lmicroseconds), - WARN: log.New(ioutil.Discard, "[xorm] [warn] ", log.Ldate|log.Lmicroseconds), + DEBUG: log.New(out, "[xorm] [debug] ", log.Ldate|log.Lmicroseconds), + ERR: log.New(out, "[xorm] [error] ", log.Ldate|log.Lmicroseconds), + INFO: log.New(out, "[xorm] [info] ", log.Ldate|log.Lmicroseconds), + WARN: log.New(out, "[xorm] [warn] ", log.Ldate|log.Lmicroseconds), } } func NewSimpleLogger2(out io.Writer, prefix string, flag int) *SimpleLogger { return &SimpleLogger{ - DEBUG: log.New(ioutil.Discard, fmt.Sprintf("%s [debug] ", prefix), log.Ldate|log.Lmicroseconds), - ERR: log.New(ioutil.Discard, fmt.Sprintf("%s [error] ", prefix), log.Ldate|log.Lmicroseconds), - INFO: log.New(ioutil.Discard, fmt.Sprintf("%s [info] ", prefix), log.Ldate|log.Lmicroseconds), - WARN: log.New(ioutil.Discard, fmt.Sprintf("%s [warn] ", prefix), log.Ldate|log.Lmicroseconds), + DEBUG: log.New(out, fmt.Sprintf("%s [debug] ", prefix), log.Ldate|log.Lmicroseconds), + ERR: log.New(out, fmt.Sprintf("%s [error] ", prefix), log.Ldate|log.Lmicroseconds), + INFO: log.New(out, fmt.Sprintf("%s [info] ", prefix), log.Ldate|log.Lmicroseconds), + WARN: log.New(out, fmt.Sprintf("%s [warn] ", prefix), log.Ldate|log.Lmicroseconds), } }