Standardize default logging tag value

vdemeester · vdemeester · commit f900e1cf47f6 · 2016-06-04T12:38:12.000+02:00
Use the same default tag value for all loggers that support tags.

Signed-off-by: Vincent Demeester &lt;vincent@sbr.pm&gt;
diff --git a/daemon/logger/fluentd/fluentd.go b/daemon/logger/fluentd/fluentd.go
@@ -65,7 +65,7 @@ func New(ctx logger.Context) (logger.Logger, error) {
 		return nil, err
 	}
 
-	tag, err := loggerutils.ParseLogTag(ctx, "{{.DaemonName}}.{{.ID}}")
+	tag, err := loggerutils.ParseLogTag(ctx, loggerutils.DefaultTemplate)
 	if err != nil {
 		return nil, err
 	}
diff --git a/daemon/logger/gelf/gelf.go b/daemon/logger/gelf/gelf.go
@@ -58,7 +58,7 @@ func New(ctx logger.Context) (logger.Logger, error) {
 	containerName := bytes.TrimLeft([]byte(ctx.ContainerName), "/")
 
 	// parse log tag
-	tag, err := loggerutils.ParseLogTag(ctx, "")
+	tag, err := loggerutils.ParseLogTag(ctx, loggerutils.DefaultTemplate)
 	if err != nil {
 		return nil, err
 	}
diff --git a/daemon/logger/journald/journald.go b/daemon/logger/journald/journald.go
@@ -50,7 +50,7 @@ func New(ctx logger.Context) (logger.Logger, error) {
 	}
 
 	// parse log tag
-	tag, err := loggerutils.ParseLogTag(ctx, "")
+	tag, err := loggerutils.ParseLogTag(ctx, loggerutils.DefaultTemplate)
 	if err != nil {
 		return nil, err
 	}
diff --git a/daemon/logger/loggerutils/log_tag.go b/daemon/logger/loggerutils/log_tag.go
@@ -7,6 +7,9 @@ import (
 	"github.com/docker/docker/utils/templates"
 )
 
+// DefaultTemplate defines the defaults template logger should use.
+const DefaultTemplate = "{{.ID}}"
+
 // ParseLogTag generates a context aware tag for consistency across different
 // log drivers based on the context of the running container.
 func ParseLogTag(ctx logger.Context, defaultTemplate string) (string, error) {
diff --git a/daemon/logger/splunk/splunk.go b/daemon/logger/splunk/splunk.go
@@ -131,7 +131,7 @@ func New(ctx logger.Context) (logger.Logger, error) {
 	nullMessage.SourceType = ctx.Config[splunkSourceTypeKey]
 	nullMessage.Index = ctx.Config[splunkIndexKey]
 
-	tag, err := loggerutils.ParseLogTag(ctx, "{{.ID}}")
+	tag, err := loggerutils.ParseLogTag(ctx, loggerutils.DefaultTemplate)
 	if err != nil {
 		return nil, err
 	}
diff --git a/daemon/logger/syslog/syslog.go b/daemon/logger/syslog/syslog.go
@@ -90,7 +90,7 @@ func rfc5424microformatterWithAppNameAsTag(p syslog.Priority, hostname, tag, con
 // the context. Supported context configuration variables are
 // syslog-address, syslog-facility, syslog-format.
 func New(ctx logger.Context) (logger.Logger, error) {
-	tag, err := loggerutils.ParseLogTag(ctx, "{{.DaemonName}}/{{.ID}}")
+	tag, err := loggerutils.ParseLogTag(ctx, loggerutils.DefaultTemplate)
 	if err != nil {
 		return nil, err
 	}

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ func New(ctx logger.Context) (logger.Logger, error) {`
`65`	`65`	`return nil, err`
`66`	`66`	`}`
`67`	`67`
`68`		`- tag, err := loggerutils.ParseLogTag(ctx, "{{.DaemonName}}.{{.ID}}")`
	`68`	`+ tag, err := loggerutils.ParseLogTag(ctx, loggerutils.DefaultTemplate)`
`69`	`69`	`if err != nil {`
`70`	`70`	`return nil, err`
`71`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ func New(ctx logger.Context) (logger.Logger, error) {`
`58`	`58`	`containerName := bytes.TrimLeft([]byte(ctx.ContainerName), "/")`
`59`	`59`
`60`	`60`	`// parse log tag`
`61`		`- tag, err := loggerutils.ParseLogTag(ctx, "")`
	`61`	`+ tag, err := loggerutils.ParseLogTag(ctx, loggerutils.DefaultTemplate)`
`62`	`62`	`if err != nil {`
`63`	`63`	`return nil, err`
`64`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ func New(ctx logger.Context) (logger.Logger, error) {`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`// parse log tag`
`53`		`- tag, err := loggerutils.ParseLogTag(ctx, "")`
	`53`	`+ tag, err := loggerutils.ParseLogTag(ctx, loggerutils.DefaultTemplate)`
`54`	`54`	`if err != nil {`
`55`	`55`	`return nil, err`
`56`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,9 @@ import (`
`7`	`7`	`"github.com/docker/docker/utils/templates"`
`8`	`8`	`)`
`9`	`9`
	`10`	`+// DefaultTemplate defines the defaults template logger should use.`
	`11`	`+const DefaultTemplate = "{{.ID}}"`
	`12`	`+`
`10`	`13`	`// ParseLogTag generates a context aware tag for consistency across different`
`11`	`14`	`// log drivers based on the context of the running container.`
`12`	`15`	`func ParseLogTag(ctx logger.Context, defaultTemplate string) (string, error) {`
Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ func New(ctx logger.Context) (logger.Logger, error) {`
`131`	`131`	`nullMessage.SourceType = ctx.Config[splunkSourceTypeKey]`
`132`	`132`	`nullMessage.Index = ctx.Config[splunkIndexKey]`
`133`	`133`
`134`		`- tag, err := loggerutils.ParseLogTag(ctx, "{{.ID}}")`
	`134`	`+ tag, err := loggerutils.ParseLogTag(ctx, loggerutils.DefaultTemplate)`
`135`	`135`	`if err != nil {`
`136`	`136`	`return nil, err`
`137`	`137`	`}`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ func rfc5424microformatterWithAppNameAsTag(p syslog.Priority, hostname, tag, con`
`90`	`90`	`// the context. Supported context configuration variables are`
`91`	`91`	`// syslog-address, syslog-facility, syslog-format.`
`92`	`92`	`func New(ctx logger.Context) (logger.Logger, error) {`
`93`		`- tag, err := loggerutils.ParseLogTag(ctx, "{{.DaemonName}}/{{.ID}}")`
	`93`	`+ tag, err := loggerutils.ParseLogTag(ctx, loggerutils.DefaultTemplate)`
`94`	`94`	`if err != nil {`
`95`	`95`	`return nil, err`
`96`	`96`	`}`