From 1ce7e6c2074d10ad83410c1f80c97f99b4d306be Mon Sep 17 00:00:00 2001 From: Felix Hanley Date: Wed, 18 Sep 2019 14:31:00 +1000 Subject: Fix JSON time formatting --- writers/json/json.go | 2 +- writers/json/json_test.go | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/writers/json/json.go b/writers/json/json.go index d2ffe72..a92b48b 100644 --- a/writers/json/json.go +++ b/writers/json/json.go @@ -35,7 +35,7 @@ func New(opts ...Option) (*Writer, error) { func (w Writer) Write(m message.Message) { vals := map[string]interface{}{ "_name": m.Name, - "_time": m.Time, + "_time": m.Time.Format(w.timeFormat), "_message": m.Content, } diff --git a/writers/json/json_test.go b/writers/json/json_test.go index e6743a2..dd995df 100644 --- a/writers/json/json_test.go +++ b/writers/json/json_test.go @@ -25,7 +25,7 @@ func TestWriter(t *testing.T) { }, expected: map[string]interface{}{ "_level": "error", "_name": "test", "_message": "msg", - "_time": "2019-05-03T13:38:29.987249+10:00", + "_time": "2019-05-03T13:38:29.987+1000", }, }, { @@ -38,7 +38,7 @@ func TestWriter(t *testing.T) { }, expected: map[string]interface{}{ "_level": "error", "_name": "test", "_message": "msg", "extra00": "one", - "_time": "2019-05-03T13:38:29.987249+10:00", + "_time": "2019-05-03T13:38:29.987+1000", }, }, { @@ -51,7 +51,7 @@ func TestWriter(t *testing.T) { }, expected: map[string]interface{}{ "_level": "error", "_name": "test", "_message": "msg", "one": "1", - "_time": "2019-05-03T13:38:29.987249+10:00", + "_time": "2019-05-03T13:38:29.987+1000", }, }, { @@ -63,7 +63,7 @@ func TestWriter(t *testing.T) { }, expected: map[string]interface{}{ "_level": "error", "_name": "test", "_message": "msg", "one": "1", "two": "2", "three": float64(3), "fo ur": "# 4", - "_time": "2019-05-03T13:38:29.987249+10:00", + "_time": "2019-05-03T13:38:29.987+1000", }, }, { @@ -76,7 +76,7 @@ func TestWriter(t *testing.T) { }, expected: map[string]interface{}{ "_level": "debug", "_name": "test", "_message": "msg", "f1": "v1", "extra00": "one", - "_time": "2019-05-03T13:38:29.987249+10:00", + "_time": "2019-05-03T13:38:29.987+1000", }, }, } -- cgit v1.2.3