docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

move syslog-tag to syslog.New function 

Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Deng Guangxing 2015-04-13 17:56:12 +08:00 committed by Michael Crosby
parent a54fd325e6
commit 4f91a333d5
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
daemon/logger/syslog/syslog.go
View File

@ -11,26 +11,23 @@ import (
type Syslog struct { type Syslog struct {
writer *syslog.Writer writer *syslog.Writer
tag string
} }
func New(tag string) (logger.Logger, error) { func New(tag string) (logger.Logger, error) {
log, err := syslog.New(syslog.LOG_USER, path.Base(os.Args[0])) log, err := syslog.New(syslog.LOG_USER, fmt.Sprintf("%s: <%s> ", path.Base(os.Args[0]), tag))
if err != nil { if err != nil {
return nil, err return nil, err
} }
return &Syslog{ return &Syslog{
writer: log, writer: log,
tag: tag,
}, nil }, nil
} }
func (s *Syslog) Log(msg *logger.Message) error { func (s *Syslog) Log(msg *logger.Message) error {
logMessage := fmt.Sprintf("%s: %s", s.tag, msg.Line)
if msg.Source == "stderr" { if msg.Source == "stderr" {
return s.writer.Err(logMessage) return s.writer.Err(string(msg.Line))
} }
return s.writer.Info(logMessage) return s.writer.Info(string(msg.Line))
} }
func (s *Syslog) Close() error { func (s *Syslog) Close() error {