kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Add NILVALUE for STRUCTURED-DATA in RFC5424 logs

Browse source 
RFC 5424 (https://tools.ietf.org/html/rfc5424#section-6.2) requires that
STRUCTURED-DATA be present, either as NILVALUE (-) or as one or more
SD-ELEMENT items. Because Docker doesn't ever create any SD-ELEMENT items,
the format should output the NILVALUE instead. This resolves parsing issues
in various RFC 5424-compliant syslog servers.

Signed-off-by: Mark Parker <godefroi@gmail.com>
This commit is contained in:
Mark Parker 2017-02-02 15:16:14 -07:00 • committed by GitHub
parent e07c392c49
commit b7d802bbcc
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
daemon/logger/syslog/syslog.go
View file

@ -68,7 +68,7 @@ func init() {
func rfc5424formatterWithAppNameAsTag(p syslog.Priority, hostname, tag, content string) string { func rfc5424formatterWithAppNameAsTag(p syslog.Priority, hostname, tag, content string) string {
timestamp := time.Now().Format(time.RFC3339) timestamp := time.Now().Format(time.RFC3339)
pid := os.Getpid() pid := os.Getpid()
msg := fmt.Sprintf("<%d>%d %s %s %s %d %s %s", msg := fmt.Sprintf("<%d>%d %s %s %s %d %s - %s",
p, 1, timestamp, hostname, tag, pid, tag, content) p, 1, timestamp, hostname, tag, pid, tag, content)
return msg return msg
} }
@ -79,7 +79,7 @@ func rfc5424formatterWithAppNameAsTag(p syslog.Priority, hostname, tag, content
func rfc5424microformatterWithAppNameAsTag(p syslog.Priority, hostname, tag, content string) string { func rfc5424microformatterWithAppNameAsTag(p syslog.Priority, hostname, tag, content string) string {
timestamp := time.Now().Format("2006-01-02T15:04:05.999999Z07:00") timestamp := time.Now().Format("2006-01-02T15:04:05.999999Z07:00")
pid := os.Getpid() pid := os.Getpid()
msg := fmt.Sprintf("<%d>%d %s %s %s %d %s %s", msg := fmt.Sprintf("<%d>%d %s %s %s %d %s - %s",
p, 1, timestamp, hostname, tag, pid, tag, content) p, 1, timestamp, hostname, tag, pid, tag, content)
return msg return msg
} }