Explorar el Código

move syslog-tag to syslog.New function

Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Deng Guangxing hace 10 años
padre
commit
4f91a333d5
Se han modificado 1 ficheros con 3 adiciones y 6 borrados
  1. 3 6
      daemon/logger/syslog/syslog.go

+ 3 - 6
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 {