Skip to content

Commit

Permalink
logger: fix wrong callback method
Browse files Browse the repository at this point in the history
Fix wrong callback in `logger.go`, and add test cases:

1. `logger.Warningln` should call `logger.Warnln`, not `logger.Warn`.

2. It's ok for `logger.Print` to call `entry.Info`, but calling `entry.Print`
   is better.

Signed-off-by: Jiang Xin <[email protected]>
  • Loading branch information
jiangxin committed Jan 22, 2019
1 parent 659e473 commit f61e48b
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 2 deletions.
4 changes: 2 additions & 2 deletions logger.go
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ func (logger *Logger) Info(args ...interface{}) {

func (logger *Logger) Print(args ...interface{}) {
entry := logger.newEntry()
entry.Info(args...)
entry.Print(args...)
logger.releaseEntry(entry)
}

Expand Down Expand Up @@ -256,7 +256,7 @@ func (logger *Logger) Warnln(args ...interface{}) {
}

func (logger *Logger) Warningln(args ...interface{}) {
logger.Warn(args...)
logger.Warnln(args...)
}

func (logger *Logger) Errorln(args ...interface{}) {
Expand Down
23 changes: 23 additions & 0 deletions logger_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"fmt"
"testing"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)

Expand Down Expand Up @@ -40,3 +41,25 @@ func TestNoFieldValueError(t *testing.T) {
_, ok := data[FieldKeyLogrusError]
require.False(t, ok)
}

func TestWarninglnNotEqualToWarning(t *testing.T) {
buf := &bytes.Buffer{}
bufln := &bytes.Buffer{}

formatter := new(TextFormatter)
formatter.DisableTimestamp = true
formatter.DisableLevelTruncation = true

l := &Logger{
Out: buf,
Formatter: formatter,
Hooks: make(LevelHooks),
Level: DebugLevel,
}
l.Warning("hello,", "world")

l.SetOutput(bufln)
l.Warningln("hello,", "world")

assert.NotEqual(t, buf.String(), bufln.String(), "Warning() and Wantingln() should not be equal")
}

0 comments on commit f61e48b

Please sign in to comment.