From 4f91a333d5c9d66ce109c36e7261dbfd3382ebbf Mon Sep 17 00:00:00 2001 From: Deng Guangxing Date: Mon, 13 Apr 2015 17:56:12 +0800 Subject: [PATCH] move syslog-tag to syslog.New function Signed-off-by: Deng Guangxing Signed-off-by: Michael Crosby --- daemon/logger/syslog/syslog.go | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/daemon/logger/syslog/syslog.go b/daemon/logger/syslog/syslog.go index afd3dacbb4..4de14aacfe 100644 --- a/daemon/logger/syslog/syslog.go +++ b/daemon/logger/syslog/syslog.go @@ -11,26 +11,23 @@ import ( type Syslog struct { writer *syslog.Writer - tag string } 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 { return nil, err } return &Syslog{ writer: log, - tag: tag, }, nil } func (s *Syslog) Log(msg *logger.Message) error { - logMessage := fmt.Sprintf("%s: %s", s.tag, msg.Line) 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 {