Skip to content

Commit c5f53f5

Browse files
bepbep
committed
Rename levels from InfoLevel to LevelInfo
Makes for easier discovery in editor.
1 parent f5d6ae8 commit c5f53f5

File tree

11 files changed

+100
-100
lines changed

11 files changed

+100
-100
lines changed

‎entry_test.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313

1414
func TestEntry_WithFields(t *testing.T) {
1515
h := memory.New()
16-
a := logg.NewLogger(logg.LoggerConfig{Handler: h, Level: logg.InfoLevel}).WithLevel(logg.InfoLevel)
16+
a := logg.NewLogger(logg.LoggerConfig{Handler: h, Level: logg.LevelInfo}).WithLevel(logg.LevelInfo)
1717

1818
b := a.WithFields(logg.Fields{{"foo", "bar"}})
1919

@@ -28,28 +28,28 @@ func TestEntry_WithFields(t *testing.T) {
2828

2929
qt.Assert(t, "upload", qt.Equals, e.Message)
3030
qt.Assert(t, logg.Fields{{"foo", "hello"}, {"bar", "world"}}, qt.DeepEquals, e.Fields)
31-
qt.Assert(t, logg.InfoLevel, qt.Equals, e.Level)
31+
qt.Assert(t, logg.LevelInfo, qt.Equals, e.Level)
3232
qt.Assert(t, time.Now().IsZero(), qt.IsFalse)
3333
}
3434

3535
func TestEntry_WithField(t *testing.T) {
3636
h := memory.New()
37-
a := logg.NewLogger(logg.LoggerConfig{Handler: h, Level: logg.InfoLevel}).WithLevel(logg.InfoLevel)
37+
a := logg.NewLogger(logg.LoggerConfig{Handler: h, Level: logg.LevelInfo}).WithLevel(logg.LevelInfo)
3838
b := a.WithField("foo", "baz").WithField("foo", "bar")
3939
b.Log(logg.String("upload"))
4040
qt.Assert(t, a.Fields, qt.IsNil)
4141
qt.Assert(t, h.Entries[0].Fields, qt.DeepEquals, logg.Fields{{"foo", "bar"}})
4242
}
4343

4444
func TestEntry_WithError(t *testing.T) {
45-
a := logg.NewLogger(logg.LoggerConfig{Handler: handlers.Discard, Level: logg.InfoLevel}).WithLevel(logg.InfoLevel)
45+
a := logg.NewLogger(logg.LoggerConfig{Handler: handlers.Discard, Level: logg.LevelInfo}).WithLevel(logg.LevelInfo)
4646
b := a.WithError(fmt.Errorf("boom"))
4747
qt.Assert(t, a.Fields, qt.IsNil)
4848
qt.Assert(t, b.Fields, qt.DeepEquals, logg.Fields{{"error", "boom"}})
4949
}
5050

5151
func TestEntry_WithError_fields(t *testing.T) {
52-
a := logg.NewLogger(logg.LoggerConfig{Handler: handlers.Discard, Level: logg.InfoLevel}).WithLevel(logg.InfoLevel)
52+
a := logg.NewLogger(logg.LoggerConfig{Handler: handlers.Discard, Level: logg.LevelInfo}).WithLevel(logg.LevelInfo)
5353
b := a.WithError(errFields("boom"))
5454
qt.Assert(t, a.Fields, qt.IsNil)
5555
qt.Assert(t,
@@ -61,14 +61,14 @@ func TestEntry_WithError_fields(t *testing.T) {
6161
}
6262

6363
func TestEntry_WithError_nil(t *testing.T) {
64-
a := logg.NewLogger(logg.LoggerConfig{Handler: handlers.Discard, Level: logg.InfoLevel}).WithLevel(logg.InfoLevel)
64+
a := logg.NewLogger(logg.LoggerConfig{Handler: handlers.Discard, Level: logg.LevelInfo}).WithLevel(logg.LevelInfo)
6565
b := a.WithError(nil)
6666
qt.Assert(t, a.Fields, qt.IsNil)
6767
qt.Assert(t, b.Fields, qt.IsNil)
6868
}
6969

7070
func TestEntry_WithDuration(t *testing.T) {
71-
a := logg.NewLogger(logg.LoggerConfig{Handler: handlers.Discard, Level: logg.InfoLevel}).WithLevel(logg.InfoLevel)
71+
a := logg.NewLogger(logg.LoggerConfig{Handler: handlers.Discard, Level: logg.LevelInfo}).WithLevel(logg.LevelInfo)
7272
b := a.WithDuration(time.Second * 2)
7373
qt.Assert(t, b.Fields, qt.DeepEquals, logg.Fields{{"duration", int64(2000)}})
7474
}

‎handlers/cli/cli.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,18 @@ var bold = color.New(color.Bold)
1919

2020
// Colors mapping.
2121
var Colors = [...]*color.Color{
22-
logg.DebugLevel: color.New(color.FgWhite),
23-
logg.InfoLevel: color.New(color.FgBlue),
24-
logg.WarnLevel: color.New(color.FgYellow),
25-
logg.ErrorLevel: color.New(color.FgRed),
22+
logg.LevelDebug: color.New(color.FgWhite),
23+
logg.LevelInfo: color.New(color.FgBlue),
24+
logg.LevelWarn: color.New(color.FgYellow),
25+
logg.LevelError: color.New(color.FgRed),
2626
}
2727

2828
// Strings mapping.
2929
var Strings = [...]string{
30-
logg.DebugLevel: "•",
31-
logg.InfoLevel: "•",
32-
logg.WarnLevel: "•",
33-
logg.ErrorLevel: "⨯",
30+
logg.LevelDebug: "•",
31+
logg.LevelInfo: "•",
32+
logg.LevelWarn: "•",
33+
logg.LevelError: "⨯",
3434
}
3535

3636
// Handler implementation.

‎handlers/json/json_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@ func TestJSONHandler(t *testing.T) {
1616

1717
l := logg.NewLogger(
1818
logg.LoggerConfig{
19-
Level: logg.InfoLevel,
19+
Level: logg.LevelInfo,
2020
Handler: json.New(&buf),
2121
Clock: clocks.Fixed(clocks.TimeCupFinalNorway1976),
2222
})
2323

24-
info := l.WithLevel(logg.InfoLevel)
24+
info := l.WithLevel(logg.LevelInfo)
2525

2626
info.WithField("user", "tj").WithField("id", "123").Log(logg.String("hello"))
2727
info.Log(logg.String("world"))
28-
info.WithLevel(logg.ErrorLevel).Log(logg.String("boom"))
28+
info.WithLevel(logg.LevelError).Log(logg.String("boom"))
2929

3030
expected := "{\"level\":\"info\",\"timestamp\":\"1976-10-24T12:15:02.127686412Z\",\"fields\":[{\"name\":\"user\",\"value\":\"tj\"},{\"name\":\"id\",\"value\":\"123\"}],\"message\":\"hello\"}\n{\"level\":\"info\",\"timestamp\":\"1976-10-24T12:15:02.127686412Z\",\"message\":\"world\"}\n{\"level\":\"error\",\"timestamp\":\"1976-10-24T12:15:02.127686412Z\",\"message\":\"boom\"}\n"
3131

‎handlers/level/level_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ import (
1313
func TestLevel(t *testing.T) {
1414
h := memory.New()
1515
l := logg.NewLogger(
16-
logg.LoggerConfig{Level: logg.ErrorLevel, Handler: level.New(h, logg.ErrorLevel)},
16+
logg.LoggerConfig{Level: logg.LevelError, Handler: level.New(h, logg.LevelError)},
1717
)
1818

19-
info := l.WithLevel(logg.InfoLevel)
19+
info := l.WithLevel(logg.LevelInfo)
2020
info.Log(logg.String("hello"))
2121
info.Log(logg.String("world"))
22-
info.WithLevel(logg.ErrorLevel).Log(logg.String("boom"))
22+
info.WithLevel(logg.LevelError).Log(logg.String("boom"))
2323

2424
qt.Assert(t, h.Entries, qt.HasLen, 1)
2525
qt.Assert(t, "boom", qt.Equals, h.Entries[0].Message)

‎handlers/multi/multi_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ func TestMulti(t *testing.T) {
1414
b := memory.New()
1515

1616
l := logg.NewLogger(logg.LoggerConfig{
17-
Level: logg.InfoLevel,
17+
Level: logg.LevelInfo,
1818
Handler: multi.New(a, b),
1919
})
2020

21-
info := l.WithLevel(logg.InfoLevel)
21+
info := l.WithLevel(logg.LevelInfo)
2222

2323
info.WithField("user", "tj").WithField("id", "123").Log(logg.String("hello"))
2424
info.Log(logg.String("world"))
25-
info.WithLevel(logg.ErrorLevel).Log(logg.String("boom"))
25+
info.WithLevel(logg.LevelError).Log(logg.String("boom"))
2626

2727
qt.Assert(t, a.Entries, qt.HasLen, 3)
2828
qt.Assert(t, b.Entries, qt.HasLen, 3)

‎handlers/text/text.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,18 @@ const (
2929

3030
// Colors mapping.
3131
var Colors = [...]int{
32-
logg.DebugLevel: gray,
33-
logg.InfoLevel: blue,
34-
logg.WarnLevel: yellow,
35-
logg.ErrorLevel: red,
32+
logg.LevelDebug: gray,
33+
logg.LevelInfo: blue,
34+
logg.LevelWarn: yellow,
35+
logg.LevelError: red,
3636
}
3737

3838
// Strings mapping.
3939
var Strings = [...]string{
40-
logg.DebugLevel: "DEBUG",
41-
logg.InfoLevel: "INFO",
42-
logg.WarnLevel: "WARN",
43-
logg.ErrorLevel: "ERROR",
40+
logg.LevelDebug: "DEBUG",
41+
logg.LevelInfo: "INFO",
42+
logg.LevelWarn: "WARN",
43+
logg.LevelError: "ERROR",
4444
}
4545

4646
// Handler implementation.

‎handlers/text/text_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ import (
1212

1313
func TestTextHandler(t *testing.T) {
1414
var buf bytes.Buffer
15-
l := logg.NewLogger(logg.LoggerConfig{Level: logg.InfoLevel, Handler: text.New(&buf)})
16-
info := l.WithLevel(logg.InfoLevel)
15+
l := logg.NewLogger(logg.LoggerConfig{Level: logg.LevelInfo, Handler: text.New(&buf)})
16+
info := l.WithLevel(logg.LevelInfo)
1717

1818
info.WithField("user", "tj").WithField("id", "123").Log(logg.String("hello"))
1919
info.WithField("user", "tj").Log(logg.String("world"))
20-
info.WithField("user", "tj").WithLevel(logg.ErrorLevel).Log(logg.String("boom"))
20+
info.WithField("user", "tj").WithLevel(logg.LevelError).Log(logg.String("boom"))
2121

2222
expected := "\x1b[34m INFO\x1b[0m[0000] hello \x1b[34muser\x1b[0m=tj \x1b[34mid\x1b[0m=123\n\x1b[34m INFO\x1b[0m[0000] world \x1b[34muser\x1b[0m=tj\n\x1b[31m ERROR\x1b[0m[0000] boom \x1b[31muser\x1b[0m=tj\n"
2323

‎levels.go‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,26 +14,26 @@ type Level int
1414

1515
// Log levels.
1616
const (
17-
InvalidLevel Level = iota
18-
DebugLevel
19-
InfoLevel
20-
WarnLevel
21-
ErrorLevel
17+
LevelInvalid Level = iota
18+
LevelDebug
19+
LevelInfo
20+
LevelWarn
21+
LevelError
2222
)
2323

2424
var levelNames = [...]string{
25-
DebugLevel: "debug",
26-
InfoLevel: "info",
27-
WarnLevel: "warn",
28-
ErrorLevel: "error",
25+
LevelDebug: "debug",
26+
LevelInfo: "info",
27+
LevelWarn: "warn",
28+
LevelError: "error",
2929
}
3030

3131
var levelStrings = map[string]Level{
32-
"debug": DebugLevel,
33-
"info": InfoLevel,
34-
"warn": WarnLevel,
35-
"warning": WarnLevel,
36-
"error": ErrorLevel,
32+
"debug": LevelDebug,
33+
"info": LevelInfo,
34+
"warn": LevelWarn,
35+
"warning": LevelWarn,
36+
"error": LevelError,
3737
}
3838

3939
// String implementation.
@@ -61,7 +61,7 @@ func (l *Level) UnmarshalJSON(b []byte) error {
6161
func ParseLevel(s string) (Level, error) {
6262
l, ok := levelStrings[strings.ToLower(s)]
6363
if !ok {
64-
return InvalidLevel, ErrInvalidLevel
64+
return LevelInvalid, ErrInvalidLevel
6565
}
6666

6767
return l, nil

‎levels_test.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ func TestParseLevel(t *testing.T) {
1313
Level Level
1414
Num int
1515
}{
16-
{"debug", DebugLevel, 0},
17-
{"info", InfoLevel, 1},
18-
{"warn", WarnLevel, 2},
19-
{"warning", WarnLevel, 3},
20-
{"error", ErrorLevel, 4},
16+
{"debug", LevelDebug, 0},
17+
{"info", LevelInfo, 1},
18+
{"warn", LevelWarn, 2},
19+
{"warning", LevelWarn, 3},
20+
{"error", LevelError, 4},
2121
}
2222

2323
for _, c := range cases {
@@ -31,14 +31,14 @@ func TestParseLevel(t *testing.T) {
3131
t.Run("invalid", func(t *testing.T) {
3232
l, err := ParseLevel("something")
3333
qt.Assert(t, err, qt.Equals, ErrInvalidLevel)
34-
qt.Assert(t, l, qt.Equals, InvalidLevel)
34+
qt.Assert(t, l, qt.Equals, LevelInvalid)
3535
})
3636
}
3737

3838
func TestLevel_MarshalJSON(t *testing.T) {
3939
e := Entry{
4040
Message: "hello",
41-
Level: InfoLevel,
41+
Level: LevelInfo,
4242
}
4343

4444
expect := `{"level":"info","timestamp":"0001-01-01T00:00:00Z","message":"hello"}`
@@ -54,5 +54,5 @@ func TestLevel_UnmarshalJSON(t *testing.T) {
5454

5555
err := json.Unmarshal([]byte(s), e)
5656
qt.Assert(t, err, qt.IsNil)
57-
qt.Assert(t, e.Level, qt.Equals, InfoLevel)
57+
qt.Assert(t, e.Level, qt.Equals, LevelInfo)
5858
}

‎logger.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ func NewLogger(cfg LoggerConfig) Logger {
9292
panic("handler cannot be nil")
9393
}
9494

95-
if cfg.Level <= 0 || cfg.Level > ErrorLevel {
95+
if cfg.Level <= 0 || cfg.Level > LevelError {
9696
panic("log level is out of range")
9797
}
9898

@@ -101,7 +101,7 @@ func NewLogger(cfg LoggerConfig) Logger {
101101
}
102102

103103
if cfg.Level == 0 {
104-
cfg.Level = InfoLevel
104+
cfg.Level = LevelInfo
105105
}
106106

107107
return &logger{

0 commit comments

Comments
 (0)