Skip to content

Commit 167b63a

Browse files
committed
Remove FatalLevel
Doing `os.Exit(-1)` inside a library doesn't sit right.
1 parent 01495ef commit 167b63a

File tree

5 files changed

+1
-13
lines changed

5 files changed

+1
-13
lines changed

‎handlers/cli/cli.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ var Colors = [...]*color.Color{
2323
log.InfoLevel: color.New(color.FgBlue),
2424
log.WarnLevel: color.New(color.FgYellow),
2525
log.ErrorLevel: color.New(color.FgRed),
26-
log.FatalLevel: color.New(color.FgRed),
2726
}
2827

2928
// Strings mapping.
@@ -32,7 +31,6 @@ var Strings = [...]string{
3231
log.InfoLevel: "•",
3332
log.WarnLevel: "•",
3433
log.ErrorLevel: "⨯",
35-
log.FatalLevel: "⨯",
3634
}
3735

3836
// Handler implementation.

‎handlers/text/text.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ var Colors = [...]int{
3333
log.InfoLevel: blue,
3434
log.WarnLevel: yellow,
3535
log.ErrorLevel: red,
36-
log.FatalLevel: red,
3736
}
3837

3938
// Strings mapping.
@@ -42,7 +41,6 @@ var Strings = [...]string{
4241
log.InfoLevel: "INFO",
4342
log.WarnLevel: "WARN",
4443
log.ErrorLevel: "ERROR",
45-
log.FatalLevel: "FATAL",
4644
}
4745

4846
// Handler implementation.

‎levels.go‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,13 @@ const (
1919
InfoLevel
2020
WarnLevel
2121
ErrorLevel
22-
FatalLevel
2322
)
2423

2524
var levelNames = [...]string{
2625
DebugLevel: "debug",
2726
InfoLevel: "info",
2827
WarnLevel: "warn",
2928
ErrorLevel: "error",
30-
FatalLevel: "fatal",
3129
}
3230

3331
var levelStrings = map[string]Level{
@@ -36,7 +34,6 @@ var levelStrings = map[string]Level{
3634
"warn": WarnLevel,
3735
"warning": WarnLevel,
3836
"error": ErrorLevel,
39-
"fatal": FatalLevel,
4037
}
4138

4239
// String implementation.

‎levels_test.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ func TestParseLevel(t *testing.T) {
1818
{"warn", WarnLevel, 2},
1919
{"warning", WarnLevel, 3},
2020
{"error", ErrorLevel, 4},
21-
{"fatal", FatalLevel, 5},
2221
}
2322

2423
for _, c := range cases {

‎logger.go‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package log
33
import (
44
"fmt"
55
stdlog "log"
6-
"os"
76
"time"
87

98
"github.com/bep/clocks"
@@ -93,7 +92,7 @@ func NewLogger(cfg LoggerConfig) Logger {
9392
panic("handler cannot be nil")
9493
}
9594

96-
if cfg.Level <= 0 || cfg.Level > FatalLevel {
95+
if cfg.Level <= 0 || cfg.Level > ErrorLevel {
9796
panic("log level is out of range")
9897
}
9998

@@ -167,7 +166,4 @@ func (l *logger) log(e *Entry, s fmt.Stringer) {
167166
stdlog.Printf("error logging: %s", err)
168167
}
169168

170-
if e.Level == FatalLevel {
171-
os.Exit(1)
172-
}
173169
}

0 commit comments

Comments
 (0)