Skip to content

Commit

Permalink
Revert PR #17 (#23)
Browse files Browse the repository at this point in the history
  • Loading branch information
ripcurld0 authored Mar 12, 2017
1 parent 5f729f2 commit 0e6d502
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
3 changes: 1 addition & 2 deletions logstash_formatter.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,7 @@ func (f *LogstashFormatter) FormatWithPrefix(entry *logrus.Entry, prefix string)
timeStampFormat := f.TimestampFormat

if timeStampFormat == "" {
//timeStampFormat = logrus.DefaultTimestampFormat
timeStampFormat = "2006-01-02 15:04:05.000"
timeStampFormat = logrus.DefaultTimestampFormat
}

fields["@timestamp"] = entry.Time.Format(timeStampFormat)
Expand Down
2 changes: 1 addition & 1 deletion logstash_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ func TestFire(t *testing.T) {
t.Error(err)
}
expected := map[string]string{
"@timestamp": "0001-01-01 00:00:00.000",
"@timestamp": "0001-01-01T00:00:00Z",
"@version": "1",
"ignore": "haaa",
"level": "debug",
Expand Down

0 comments on commit 0e6d502

Please sign in to comment.