vbatts/pkg
1
0
Fork 0
Code Pull requests Releases Activity

Merge pull request #10424 from LK4D4/fix_non_tailed_log_format

Browse source 
Fix logs, so now, old and followed logs has same format without []
This commit is contained in:
Michael Crosby 2015-02-06 14:35:45 -08:00
commit 35464d7db3
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
jsonlog/jsonlog.go
View file

@ -23,7 +23,7 @@ func (jl *JSONLog) Format(format string) (string, error) {
m, err := json.Marshal(jl)
return string(m), err
}
return fmt.Sprintf("[%s] %s", jl.Created.Format(format), jl.Log), nil
return fmt.Sprintf("%s %s", jl.Created.Format(format), jl.Log), nil
}
func (jl *JSONLog) Reset() {

3
jsonlog/jsonlog_test.go
View file

@ -30,7 +30,8 @@ func TestWriteLog(t *testing.T) {
if len(lines) != 30 {
t.Fatalf("Must be 30 lines but got %d", len(lines))
}
logRe := regexp.MustCompile(`\[.*\] Line that thinks that it is log line from docker`)
// 30+ symbols, five more can come from system timezone
logRe := regexp.MustCompile(`.{30,} Line that thinks that it is log line from docker`)
for _, l := range lines {
if !logRe.MatchString(l) {
t.Fatalf("Log line not in expected format: %q", l)