Skip to content

Commit

Permalink
code simplify for package logs
Browse files Browse the repository at this point in the history
  • Loading branch information
fuxiaohei committed Feb 23, 2015
1 parent 29d4823 commit 77c1109
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 31 deletions.
11 changes: 3 additions & 8 deletions logs/conn.go
Expand Up @@ -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.
Expand Down Expand Up @@ -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 {
Expand Down
18 changes: 8 additions & 10 deletions logs/console.go
Expand Up @@ -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
}

Expand All @@ -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.
Expand All @@ -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
}

Expand Down
9 changes: 2 additions & 7 deletions logs/file.go
Expand Up @@ -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) {
Expand Down Expand Up @@ -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
}
Expand Down
4 changes: 2 additions & 2 deletions logs/log.go
Expand Up @@ -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()
Expand Down
7 changes: 3 additions & 4 deletions logs/smtp.go
Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand Down

0 comments on commit 77c1109

Please sign in to comment.