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

Merge pull request #18595 from mariussturm/gelf-no-trim-18568

Browse source 
don't trim GELF message
This commit is contained in:
Alexander Morozov 2015-12-11 07:39:44 -08:00
commit 5525593a68
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
daemon/logger/gelf/gelf.go
View file

@ -96,9 +96,6 @@ func New(ctx logger.Context) (logger.Logger, error) {
} }
func (s *gelfLogger) Log(msg *logger.Message) error { func (s *gelfLogger) Log(msg *logger.Message) error {
// remove trailing and leading whitespace
short := bytes.TrimSpace([]byte(msg.Line))
level := gelf.LOG_INFO level := gelf.LOG_INFO
if msg.Source == "stderr" { if msg.Source == "stderr" {
level = gelf.LOG_ERR level = gelf.LOG_ERR
@ -107,7 +104,7 @@ func (s *gelfLogger) Log(msg *logger.Message) error {
m := gelf.Message{ m := gelf.Message{
Version: "1.1", Version: "1.1",
Host: s.hostname, Host: s.hostname,
Short: string(short), Short: string(msg.Line),
TimeUnix: float64(msg.Timestamp.UnixNano()/int64(time.Millisecond)) / 1000.0, TimeUnix: float64(msg.Timestamp.UnixNano()/int64(time.Millisecond)) / 1000.0,
Level: level, Level: level,
Extra: s.extra, Extra: s.extra,