77c11091 by fuxiaohei

code simplify for package logs

1 parent 29d48238
...@@ -43,11 +43,7 @@ func NewConn() LoggerInterface { ...@@ -43,11 +43,7 @@ func NewConn() LoggerInterface {
43 // init connection writer with json config. 43 // init connection writer with json config.
44 // json config only need key "level". 44 // json config only need key "level".
45 func (c *ConnWriter) Init(jsonconfig string) error { 45 func (c *ConnWriter) Init(jsonconfig string) error {
46 err := json.Unmarshal([]byte(jsonconfig), c) 46 return json.Unmarshal([]byte(jsonconfig), c)
47 if err != nil {
48 return err
49 }
50 return nil
51 } 47 }
52 48
53 // write message in connection. 49 // write message in connection.
...@@ -77,10 +73,9 @@ func (c *ConnWriter) Flush() { ...@@ -77,10 +73,9 @@ func (c *ConnWriter) Flush() {
77 73
78 // destroy connection writer and close tcp listener. 74 // destroy connection writer and close tcp listener.
79 func (c *ConnWriter) Destroy() { 75 func (c *ConnWriter) Destroy() {
80 if c.innerWriter == nil { 76 if c.innerWriter != nil {
81 return
82 }
83 c.innerWriter.Close() 77 c.innerWriter.Close()
78 }
84 } 79 }
85 80
86 func (c *ConnWriter) connect() error { 81 func (c *ConnWriter) connect() error {
......
...@@ -50,9 +50,10 @@ type ConsoleWriter struct { ...@@ -50,9 +50,10 @@ type ConsoleWriter struct {
50 50
51 // create ConsoleWriter returning as LoggerInterface. 51 // create ConsoleWriter returning as LoggerInterface.
52 func NewConsole() LoggerInterface { 52 func NewConsole() LoggerInterface {
53 cw := new(ConsoleWriter) 53 cw := &ConsoleWriter{
54 cw.lg = log.New(os.Stdout, "", log.Ldate|log.Ltime) 54 lg: log.New(os.Stdout, "", log.Ldate|log.Ltime),
55 cw.Level = LevelDebug 55 Level: LevelDebug,
56 }
56 return cw 57 return cw
57 } 58 }
58 59
...@@ -62,11 +63,7 @@ func (c *ConsoleWriter) Init(jsonconfig string) error { ...@@ -62,11 +63,7 @@ func (c *ConsoleWriter) Init(jsonconfig string) error {
62 if len(jsonconfig) == 0 { 63 if len(jsonconfig) == 0 {
63 return nil 64 return nil
64 } 65 }
65 err := json.Unmarshal([]byte(jsonconfig), c) 66 return json.Unmarshal([]byte(jsonconfig), c)
66 if err != nil {
67 return err
68 }
69 return nil
70 } 67 }
71 68
72 // write message in console. 69 // write message in console.
...@@ -76,9 +73,10 @@ func (c *ConsoleWriter) WriteMsg(msg string, level int) error { ...@@ -76,9 +73,10 @@ func (c *ConsoleWriter) WriteMsg(msg string, level int) error {
76 } 73 }
77 if goos := runtime.GOOS; goos == "windows" { 74 if goos := runtime.GOOS; goos == "windows" {
78 c.lg.Println(msg) 75 c.lg.Println(msg)
79 } else { 76 return nil
80 c.lg.Println(colors[level](msg))
81 } 77 }
78 c.lg.Println(colors[level](msg))
79
82 return nil 80 return nil
83 } 81 }
84 82
......
...@@ -123,11 +123,7 @@ func (w *FileLogWriter) startLogger() error { ...@@ -123,11 +123,7 @@ func (w *FileLogWriter) startLogger() error {
123 return err 123 return err
124 } 124 }
125 w.mw.SetFd(fd) 125 w.mw.SetFd(fd)
126 err = w.initFd() 126 return w.initFd()
127 if err != nil {
128 return err
129 }
130 return nil
131 } 127 }
132 128
133 func (w *FileLogWriter) docheck(size int) { 129 func (w *FileLogWriter) docheck(size int) {
...@@ -170,14 +166,13 @@ func (w *FileLogWriter) initFd() error { ...@@ -170,14 +166,13 @@ func (w *FileLogWriter) initFd() error {
170 } 166 }
171 w.maxsize_cursize = int(finfo.Size()) 167 w.maxsize_cursize = int(finfo.Size())
172 w.daily_opendate = time.Now().Day() 168 w.daily_opendate = time.Now().Day()
169 w.maxlines_curlines = 0
173 if finfo.Size() > 0 { 170 if finfo.Size() > 0 {
174 count, err := w.lines() 171 count, err := w.lines()
175 if err != nil { 172 if err != nil {
176 return err 173 return err
177 } 174 }
178 w.maxlines_curlines = count 175 w.maxlines_curlines = count
179 } else {
180 w.maxlines_curlines = 0
181 } 176 }
182 return nil 177 return nil
183 } 178 }
......
...@@ -292,9 +292,9 @@ func (bl *BeeLogger) Close() { ...@@ -292,9 +292,9 @@ func (bl *BeeLogger) Close() {
292 fmt.Println("ERROR, unable to WriteMsg (while closing logger):", err) 292 fmt.Println("ERROR, unable to WriteMsg (while closing logger):", err)
293 } 293 }
294 } 294 }
295 } else { 295 continue
296 break
297 } 296 }
297 break
298 } 298 }
299 for _, l := range bl.outputs { 299 for _, l := range bl.outputs {
300 l.Flush() 300 l.Flush()
......
...@@ -25,7 +25,8 @@ import ( ...@@ -25,7 +25,8 @@ import (
25 ) 25 )
26 26
27 const ( 27 const (
28 subjectPhrase = "Diagnostic message from server" 28 // no usage
29 // subjectPhrase = "Diagnostic message from server"
29 ) 30 )
30 31
31 // smtpWriter implements LoggerInterface and is used to send emails via given SMTP-server. 32 // 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 { ...@@ -146,9 +147,7 @@ func (s *SmtpWriter) WriteMsg(msg string, level int) error {
146 mailmsg := []byte("To: " + strings.Join(s.RecipientAddresses, ";") + "\r\nFrom: " + s.FromAddress + "<" + s.FromAddress + 147 mailmsg := []byte("To: " + strings.Join(s.RecipientAddresses, ";") + "\r\nFrom: " + s.FromAddress + "<" + s.FromAddress +
147 ">\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) 148 ">\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)
148 149
149 err := s.sendMail(s.Host, auth, s.FromAddress, s.RecipientAddresses, mailmsg) 150 return s.sendMail(s.Host, auth, s.FromAddress, s.RecipientAddresses, mailmsg)
150
151 return err
152 } 151 }
153 152
154 // implementing method. empty. 153 // implementing method. empty.
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!