From 5c1f2cd52c2defcc298ef342d9b3eebe160b33ad Mon Sep 17 00:00:00 2001 From: Shun Yanaura Date: Fri, 19 Oct 2018 20:35:56 +0900 Subject: [PATCH] Make logrus.Level implement encoding.TextUnmarshaler --- logrus.go | 12 ++++++++++++ logrus_test.go | 13 +++++++++++++ 2 files changed, 25 insertions(+) diff --git a/logrus.go b/logrus.go index 6fff506..5dab4d4 100644 --- a/logrus.go +++ b/logrus.go @@ -53,6 +53,18 @@ func ParseLevel(lvl string) (Level, error) { return l, fmt.Errorf("not a valid logrus Level: %q", lvl) } +// UnmarshalText implements encoding.TextUnmarshaler. +func (level *Level) UnmarshalText(text []byte) error { + l, err := ParseLevel(string(text)) + if err != nil { + return err + } + + *level = Level(l) + + return nil +} + // A constant exposing all logging levels var AllLevels = []Level{ PanicLevel, diff --git a/logrus_test.go b/logrus_test.go index 97d15d7..8725013 100644 --- a/logrus_test.go +++ b/logrus_test.go @@ -372,6 +372,19 @@ func TestParseLevel(t *testing.T) { assert.Equal(t, "not a valid logrus Level: \"invalid\"", err.Error()) } +func TestUnmarshalText(t *testing.T) { + var u Level + for _, level := range AllLevels { + t.Run(level.String(), func(t *testing.T) { + assert.NoError(t, u.UnmarshalText([]byte(level.String()))) + assert.Equal(t, level, u) + }) + } + t.Run("invalid", func(t *testing.T) { + assert.Error(t, u.UnmarshalText([]byte("invalid"))) + }) +} + func TestGetSetLevelRace(t *testing.T) { wg := sync.WaitGroup{} for i := 0; i < 100; i++ {