Merge branch 'master' of github.com:go-xorm/xorm

This commit is contained in:
Lunny Xiao 2014-08-08 14:07:27 +08:00
commit 6ddc6b411f
1 changed files with 20 additions and 7 deletions

View File

@ -1,7 +1,9 @@
package xorm package xorm
import ( import (
"fmt"
"io" "io"
"io/ioutil"
"log" "log"
) )
@ -14,35 +16,46 @@ type ILogger interface {
} }
type SimpleLogger struct { type SimpleLogger struct {
logger *log.Logger DEBUG *log.Logger
ERR *log.Logger
INFO *log.Logger
WARN *log.Logger
} }
func NewSimpleLogger(out io.Writer) *SimpleLogger { func NewSimpleLogger(out io.Writer) *SimpleLogger {
return &SimpleLogger{ return &SimpleLogger{
logger: log.New(out, "[xorm] ", log.Ldate|log.Lmicroseconds)} 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),
}
} }
func NewSimpleLogger2(out io.Writer, prefix string, flag int) *SimpleLogger { func NewSimpleLogger2(out io.Writer, prefix string, flag int) *SimpleLogger {
return &SimpleLogger{ return &SimpleLogger{
logger: log.New(out, prefix, flag)} 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),
}
} }
func (s *SimpleLogger) Debug(m string) (err error) { func (s *SimpleLogger) Debug(m string) (err error) {
s.logger.Println("[debug]", m) s.DEBUG.Println(m)
return return
} }
func (s *SimpleLogger) Err(m string) (err error) { func (s *SimpleLogger) Err(m string) (err error) {
s.logger.Println("[error]", m) s.ERR.Println(m)
return return
} }
func (s *SimpleLogger) Info(m string) (err error) { func (s *SimpleLogger) Info(m string) (err error) {
s.logger.Println("[info]", m) s.INFO.Println(m)
return return
} }
func (s *SimpleLogger) Warning(m string) (err error) { func (s *SimpleLogger) Warning(m string) (err error) {
s.logger.Println("[warning]", m) s.WARN.Println(m)
return return
} }