Skip to content

Commit

Permalink
Merge pull request #1212 from alecbz/alec/remove-dead-panic
Browse files Browse the repository at this point in the history
Remove dead panic in Entry.Panic
  • Loading branch information
dgsb authored Dec 17, 2020
2 parents 44d983d + 02fcb16 commit cd4bf4e
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 1 deletion.
1 change: 0 additions & 1 deletion entry.go
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,6 @@ func (entry *Entry) Fatal(args ...interface{}) {

func (entry *Entry) Panic(args ...interface{}) {
entry.Log(PanicLevel, args...)
panic(fmt.Sprint(args...))
}

// Entry Printf family functions
Expand Down
22 changes: 22 additions & 0 deletions entry_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,28 @@ func TestEntryPanicf(t *testing.T) {
entry.WithField("err", errBoom).Panicf("kaboom %v", true)
}

func TestEntryPanic(t *testing.T) {
errBoom := fmt.Errorf("boom again")

defer func() {
p := recover()
assert.NotNil(t, p)

switch pVal := p.(type) {
case *Entry:
assert.Equal(t, "kaboom", pVal.Message)
assert.Equal(t, errBoom, pVal.Data["err"])
default:
t.Fatalf("want type *Entry, got %T: %#v", pVal, pVal)
}
}()

logger := New()
logger.Out = &bytes.Buffer{}
entry := NewEntry(logger)
entry.WithField("err", errBoom).Panic("kaboom")
}

const (
badMessage = "this is going to panic"
panicMessage = "this is broken"
Expand Down

0 comments on commit cd4bf4e

Please sign in to comment.