diff --git a/logs/conn.go b/logs/conn.go index 612634fa..2240eece 100644 --- a/logs/conn.go +++ b/logs/conn.go @@ -43,11 +43,7 @@ func NewConn() LoggerInterface { // init connection writer with json config. // json config only need key "level". func (c *ConnWriter) Init(jsonconfig string) error { - err := json.Unmarshal([]byte(jsonconfig), c) - if err != nil { - return err - } - return nil + return json.Unmarshal([]byte(jsonconfig), c) } // write message in connection. @@ -77,10 +73,9 @@ func (c *ConnWriter) Flush() { // destroy connection writer and close tcp listener. func (c *ConnWriter) Destroy() { - if c.innerWriter == nil { - return + if c.innerWriter != nil { + c.innerWriter.Close() } - c.innerWriter.Close() } func (c *ConnWriter) connect() error { diff --git a/logs/console.go b/logs/console.go index 461291c2..ce7ecd54 100644 --- a/logs/console.go +++ b/logs/console.go @@ -50,9 +50,10 @@ type ConsoleWriter struct { // create ConsoleWriter returning as LoggerInterface. func NewConsole() LoggerInterface { - cw := new(ConsoleWriter) - cw.lg = log.New(os.Stdout, "", log.Ldate|log.Ltime) - cw.Level = LevelDebug + cw := &ConsoleWriter{ + lg: log.New(os.Stdout, "", log.Ldate|log.Ltime), + Level: LevelDebug, + } return cw } @@ -62,11 +63,7 @@ func (c *ConsoleWriter) Init(jsonconfig string) error { if len(jsonconfig) == 0 { return nil } - err := json.Unmarshal([]byte(jsonconfig), c) - if err != nil { - return err - } - return nil + return json.Unmarshal([]byte(jsonconfig), c) } // write message in console. @@ -76,9 +73,10 @@ func (c *ConsoleWriter) WriteMsg(msg string, level int) error { } if goos := runtime.GOOS; goos == "windows" { c.lg.Println(msg) - } else { - c.lg.Println(colors[level](msg)) + return nil } + c.lg.Println(colors[level](msg)) + return nil } diff --git a/logs/file.go b/logs/file.go index e237170b..2d3449ce 100644 --- a/logs/file.go +++ b/logs/file.go @@ -123,11 +123,7 @@ func (w *FileLogWriter) startLogger() error { return err } w.mw.SetFd(fd) - err = w.initFd() - if err != nil { - return err - } - return nil + return w.initFd() } func (w *FileLogWriter) docheck(size int) { @@ -170,14 +166,13 @@ func (w *FileLogWriter) initFd() error { } w.maxsize_cursize = int(finfo.Size()) w.daily_opendate = time.Now().Day() + w.maxlines_curlines = 0 if finfo.Size() > 0 { count, err := w.lines() if err != nil { return err } w.maxlines_curlines = count - } else { - w.maxlines_curlines = 0 } return nil } diff --git a/logs/log.go b/logs/log.go index 6abfb005..32e0187c 100644 --- a/logs/log.go +++ b/logs/log.go @@ -292,9 +292,9 @@ func (bl *BeeLogger) Close() { fmt.Println("ERROR, unable to WriteMsg (while closing logger):", err) } } - } else { - break + continue } + break } for _, l := range bl.outputs { l.Flush() diff --git a/logs/smtp.go b/logs/smtp.go index 19a0f510..95123ebf 100644 --- a/logs/smtp.go +++ b/logs/smtp.go @@ -25,7 +25,8 @@ import ( ) const ( - subjectPhrase = "Diagnostic message from server" +// no usage +// subjectPhrase = "Diagnostic message from server" ) // smtpWriter implements LoggerInterface and is used to send emails via given SMTP-server. @@ -146,9 +147,7 @@ func (s *SmtpWriter) WriteMsg(msg string, level int) error { mailmsg := []byte("To: " + strings.Join(s.RecipientAddresses, ";") + "\r\nFrom: " + s.FromAddress + "<" + s.FromAddress + ">\r\nSubject: " + s.Subject + "\r\n" + content_type + "\r\n\r\n" + fmt.Sprintf(".%s", time.Now().Format("2006-01-02 15:04:05")) + msg) - err := s.sendMail(s.Host, auth, s.FromAddress, s.RecipientAddresses, mailmsg) - - return err + return s.sendMail(s.Host, auth, s.FromAddress, s.RecipientAddresses, mailmsg) } // implementing method. empty.