update ILogger interface, to reduce performance cost where string format or concat is done when it's need to write out

engine.go

@@ -188,7 +188,7 @@ func (engine *Engine) logSQL(sqlStr string, sqlArgs ...interface{}) {
 // logging error
 func (engine *Engine) LogError(contents ...interface{}) {
 	if engine.ShowErr {
-		engine.Logger.Err(fmt.Sprint(contents...))
+		engine.Logger.Err(contents...)
 	}
 }
 
@@ -201,39 +201,39 @@ func (engine *Engine) LogErrorf(format string, contents ...interface{}) {
 // logging info
 func (engine *Engine) LogInfo(contents ...interface{}) {
 	if engine.ShowInfo {
-		engine.Logger.Info(fmt.Sprint(contents...))
+		engine.Logger.Info(contents...)
 	}
 }
 
 func (engine *Engine) LogInfof(format string, contents ...interface{}) {
 	if engine.ShowErr {
-		engine.Logger.Info(fmt.Sprintf(format, contents...))
+		engine.Logger.Infof(format, contents...)
 	}
 }
 
 // logging debug
 func (engine *Engine) LogDebug(contents ...interface{}) {
 	if engine.ShowDebug {
-		engine.Logger.Debug(fmt.Sprint(contents...))
+		engine.Logger.Debug(contents...)
 	}
 }
 
 func (engine *Engine) LogDebugf(format string, contents ...interface{}) {
 	if engine.ShowDebug {
-		engine.Logger.Debug(fmt.Sprintf(format, contents...))
+		engine.Logger.Debugf(format, contents...)
 	}
 }
 
 // logging warn
 func (engine *Engine) LogWarn(contents ...interface{}) {
 	if engine.ShowWarn {
-		engine.Logger.Warning(fmt.Sprint(contents...))
+		engine.Logger.Warning(contents...)
 	}
 }
 
 func (engine *Engine) LogWarnf(format string, contents ...interface{}) {
 	if engine.ShowWarn {
-		engine.Logger.Warning(fmt.Sprintf(format, contents...))
+		engine.Logger.Warningf(format, contents...)
 	}
 }
 

logger.go

@@ -2,23 +2,16 @@ package xorm
 
 import (
 	"fmt"
+	"github.com/go-xorm/core"
 	"io"
 	"log"
-)
+	"log/syslog"
-
-type LogLevel int
-
-const (
-	LOG_ERR LogLevel = iota + 3
-	LOG_WARNING
-	LOG_INFO = iota + 6
-	LOG_DEBUG
 )
 
 const (
 	DEFAULT_LOG_PREFIX = "[xorm]"
 	DEFAULT_LOG_FLAG   = log.Ldate | log.Lmicroseconds
-	DEFAULT_LOG_LEVEL  = LOG_DEBUG
+	DEFAULT_LOG_LEVEL  = core.LOG_DEBUG
 )
 
 type SimpleLogger struct {
@@ -26,7 +19,7 @@ type SimpleLogger struct {
 	ERR   *log.Logger
 	INFO  *log.Logger
 	WARN  *log.Logger
-	LogLevel LogLevel
+	level core.LogLevel
 }
 
 func NewSimpleLogger(out io.Writer) *SimpleLogger {
@@ -37,38 +30,126 @@ func NewSimpleLogger2(out io.Writer, prefix string, flag int) *SimpleLogger {
 	return NewSimpleLogger3(out, prefix, flag, DEFAULT_LOG_LEVEL)
 }
 
-func NewSimpleLogger3(out io.Writer, prefix string, flag int, logLevel LogLevel) *SimpleLogger {
+func NewSimpleLogger3(out io.Writer, prefix string, flag int, l core.LogLevel) *SimpleLogger {
 	return &SimpleLogger{
 		DEBUG: log.New(out, fmt.Sprintf("%s [debug] ", prefix), flag),
 		ERR:   log.New(out, fmt.Sprintf("%s [error] ", prefix), flag),
 		INFO:  log.New(out, fmt.Sprintf("%s [info]  ", prefix), flag),
 		WARN:  log.New(out, fmt.Sprintf("%s [warn]  ", prefix), flag),
-		LogLevel: logLevel,
+		level: l,
 	}
 }
 
-func (s *SimpleLogger) Debug(m string) (err error) {
+func (s *SimpleLogger) Err(v ...interface{}) (err error) {
-	if s.LogLevel >= LOG_DEBUG {
+	if s.level > core.LOG_OFF && s.level <= core.LOG_ERR {
-		s.DEBUG.Println(m)
+		s.ERR.Println(v...)
 	}
 	return
 }
 
-func (s *SimpleLogger) Err(m string) (err error) {
+func (s *SimpleLogger) Errf(format string, v ...interface{}) (err error) {
-	s.ERR.Println(m)
+	if s.level > core.LOG_OFF && s.level <= core.LOG_ERR {
-	return
+		s.ERR.Printf(format, v...)
-}
-
-func (s *SimpleLogger) Info(m string) (err error) {
-	if s.LogLevel >= LOG_INFO {
-		s.INFO.Println(m)
 	}
 	return
 }
 
-func (s *SimpleLogger) Warning(m string) (err error) {
+func (s *SimpleLogger) Debug(v ...interface{}) (err error) {
-	if s.LogLevel >= LOG_WARNING {
+	if s.level > core.LOG_OFF && s.level <= core.LOG_DEBUG {
-		s.WARN.Println(m)
+		s.DEBUG.Println(v...)
 	}
 	return
 }
+
+func (s *SimpleLogger) Debugf(format string, v ...interface{}) (err error) {
+	if s.level > core.LOG_OFF && s.level >= core.LOG_DEBUG {
+		s.DEBUG.Printf(format, v...)
+	}
+	return
+}
+
+func (s *SimpleLogger) Info(v ...interface{}) (err error) {
+	if s.level > core.LOG_OFF && s.level >= core.LOG_INFO {
+		s.INFO.Println(v...)
+	}
+	return
+}
+
+func (s *SimpleLogger) Infof(format string, v ...interface{}) (err error) {
+	if s.level > core.LOG_OFF && s.level >= core.LOG_INFO {
+		s.INFO.Printf(format, v...)
+	}
+	return
+}
+
+func (s *SimpleLogger) Warning(v ...interface{}) (err error) {
+	if s.level > core.LOG_OFF && s.level >= core.LOG_WARNING {
+		s.WARN.Println(v...)
+	}
+	return
+}
+
+func (s *SimpleLogger) Warningf(format string, v ...interface{}) (err error) {
+	if s.level > core.LOG_OFF && s.level >= core.LOG_WARNING {
+		s.WARN.Printf(format, v...)
+	}
+	return
+}
+
+func (s *SimpleLogger) Level() core.LogLevel {
+	return s.level
+}
+
+func (s *SimpleLogger) SetLevel(l core.LogLevel) (err error) {
+	s.level = l
+	return
+}
+
+type SyslogLogger struct {
+	w *syslog.Writer
+}
+
+func NewSyslogLogger(w *syslog.Writer) *SyslogLogger {
+	return &SyslogLogger{w: w}
+}
+
+func (s *SyslogLogger) Debug(v ...interface{}) (err error) {
+	return s.w.Debug(fmt.Sprint(v...))
+}
+
+func (s *SyslogLogger) Debugf(format string, v ...interface{}) (err error) {
+	return s.w.Debug(fmt.Sprintf(format, v...))
+}
+
+func (s *SyslogLogger) Err(v ...interface{}) (err error) {
+	return s.w.Err(fmt.Sprint(v...))
+}
+
+func (s *SyslogLogger) Errf(format string, v ...interface{}) (err error) {
+	return s.w.Err(fmt.Sprintf(format, v...))
+}
+
+func (s *SyslogLogger) Info(v ...interface{}) (err error) {
+	return s.w.Info(fmt.Sprint(v...))
+}
+
+func (s *SyslogLogger) Infof(format string, v ...interface{}) (err error) {
+	return s.w.Info(fmt.Sprintf(format, v...))
+}
+
+func (s *SyslogLogger) Warning(v ...interface{}) (err error) {
+	return s.w.Warning(fmt.Sprint(v...))
+}
+
+func (s *SyslogLogger) Warningf(format string, v ...interface{}) (err error) {
+	return s.w.Warning(fmt.Sprintf(format, v...))
+}
+
+func (s *SyslogLogger) Level() core.LogLevel {
+	return core.LOG_UNKNOWN
+}
+
+// SetLevel always return error, as current log/syslog package doesn't allow to set priority level after syslog.Writer created
+func (s *SyslogLogger) SetLevel(l core.LogLevel) (err error) {
+	return fmt.Errorf("unable to set syslog level")
+}