From 4fdc045edce10989ba4c59452c9ff05117fc3f97 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Thu, 21 Aug 2014 11:40:55 +0800 Subject: [PATCH] move syslogger as condition compile --- logger.go | 53 ++-------------------------------------------- syslogger.go | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 51 deletions(-) create mode 100644 syslogger.go diff --git a/logger.go b/logger.go index b9e9be9f..da3ba019 100644 --- a/logger.go +++ b/logger.go @@ -2,10 +2,10 @@ package xorm import ( "fmt" - "github.com/go-xorm/core" "io" "log" - "log/syslog" + + "github.com/go-xorm/core" ) const ( @@ -104,52 +104,3 @@ 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") -} diff --git a/syslogger.go b/syslogger.go new file mode 100644 index 00000000..155029e9 --- /dev/null +++ b/syslogger.go @@ -0,0 +1,59 @@ +package xorm + +// +build !windows !nacl !plan9 + +import ( + "fmt" + "log/syslog" + + "github.com/go-xorm/core" +) + +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") +}