Skip to content

Commit

Permalink
delete EOL removal from adaptor, handled by logger
Browse files Browse the repository at this point in the history
  • Loading branch information
umputun committed Apr 1, 2019
1 parent 125d849 commit ee60c0b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions adaptor.go
Expand Up @@ -11,9 +11,9 @@ type Writer struct {
level string // if defined added to each message
}

// Write to lgr.L, trim EOL
// Write to lgr.L
func (w *Writer) Write(p []byte) (n int, err error) {
w.Logf(strings.TrimSuffix(w.level+string(p), "\n"))
w.Logf(w.level + string(p))
return len(p), nil
}

Expand Down
4 changes: 2 additions & 2 deletions adaptor_test.go
Expand Up @@ -34,7 +34,7 @@ func TestAdaptor_ToWriterNoLevel(t *testing.T) {

rout.Reset()
rerr.Reset()
_, err = wr.Write([]byte("INFO something blah 123"))
_, err = wr.Write([]byte("INFO something blah 123\n"))
require.NoError(t, err)
assert.Equal(t, "2018/01/07 13:02:34.000 [INFO] something blah 123\n", rout.String())
}
Expand All @@ -45,7 +45,7 @@ func TestAdaptor_ToStdLogger(t *testing.T) {
l.now = func() time.Time { return time.Date(2018, 1, 7, 13, 2, 34, 0, time.Local) }

wr := ToStdLogger(l, "WARN")
wr.Print("something")
wr.Print("something\n")
assert.Equal(t, "2018/01/07 13:02:34.000 WARN something\n", rout.String())

rout.Reset()
Expand Down

0 comments on commit ee60c0b

Please sign in to comment.