diff --git a/internal/errors/errors.go b/internal/errors/errors.go index db0b92a..4b42124 100644 --- a/internal/errors/errors.go +++ b/internal/errors/errors.go @@ -256,21 +256,6 @@ func IsRedisCommandError(err error) bool { return As(err, &target) } -// PanicError defines an error when occurred a panic error. -type PanicError struct { - ErrMsg string -} - -func (e *PanicError) Error() string { - return fmt.Sprintf("panic error cause by: %s", e.ErrMsg) -} - -// IsPanicError reports whether any error in err's chain is of type PanicError. -func IsPanicError(err error) bool { - var target *PanicError - return As(err, &target) -} - /************************************************* Standard Library errors package functions *************************************************/ diff --git a/internal/errors/errors_test.go b/internal/errors/errors_test.go index b7b9dff..ae44170 100644 --- a/internal/errors/errors_test.go +++ b/internal/errors/errors_test.go @@ -131,12 +131,6 @@ func TestErrorPredicates(t *testing.T) { err: E(Op("rdb.ArchiveTask"), NotFound, &QueueNotFoundError{Queue: "default"}), want: true, }, - { - desc: "IsPanicError should detect presence of PanicError in err's chain", - fn: IsPanicError, - err: E(Op("unknown"), Unknown, &PanicError{ErrMsg: "Something went wrong"}), - want: true, - }, } for _, tc := range tests { diff --git a/processor.go b/processor.go index b177f33..925b9c9 100644 --- a/processor.go +++ b/processor.go @@ -40,7 +40,8 @@ type processor struct { retryDelayFunc RetryDelayFunc isFailureFunc func(error) bool - errHandler ErrorHandler + errHandler ErrorHandler + shutdownTimeout time.Duration // channel via which to send sync requests to syncer. @@ -412,9 +413,7 @@ func (p *processor) queues() []string { func (p *processor) perform(ctx context.Context, task *Task) (err error) { defer func() { if x := recover(); x != nil { - errMsg := string(debug.Stack()) - - p.logger.Errorf("recovering from panic. See the stack trace below for details:\n%s", errMsg) + p.logger.Errorf("recovering from panic. See the stack trace below for details:\n%s", string(debug.Stack())) _, file, line, ok := runtime.Caller(1) // skip the first frame (panic itself) if ok && strings.Contains(file, "runtime/") { // The panic came from the runtime, most likely due to incorrect @@ -428,9 +427,6 @@ func (p *processor) perform(ctx context.Context, task *Task) (err error) { } else { err = fmt.Errorf("panic: %v", x) } - err = &errors.PanicError{ - ErrMsg: errMsg, - } } }() return p.handler.ProcessTask(ctx, task) @@ -525,7 +521,3 @@ func (p *processor) computeDeadline(msg *base.TaskMessage) time.Time { } return time.Unix(msg.Deadline, 0) } - -func IsPanicError(err error) bool { - return errors.IsPanicError(err) -} diff --git a/processor_test.go b/processor_test.go index 4112181..8698644 100644 --- a/processor_test.go +++ b/processor_test.go @@ -9,7 +9,6 @@ import ( "encoding/json" "fmt" "sort" - "strings" "sync" "testing" "time" @@ -922,45 +921,3 @@ func TestProcessorComputeDeadline(t *testing.T) { } } } - -func TestReturnPanicError(t *testing.T) { - - task := NewTask("gen_thumbnail", h.JSON(map[string]interface{}{"src": "some/img/path"})) - - tests := []struct { - name string - handler HandlerFunc - IsPanicError bool - }{ - { - name: "should return panic error when occurred panic recovery", - handler: func(ctx context.Context, t *Task) error { - panic("something went terribly wrong") - }, - IsPanicError: true, - }, - { - name: "should return normal error when don't occur panic recovery", - handler: func(ctx context.Context, t *Task) error { - return fmt.Errorf("something went terribly wrong") - }, - IsPanicError: false, - }, - } - - for _, tc := range tests { - t.Run(tc.name, func(t *testing.T) { - p := processor{ - logger: log.NewLogger(nil), - handler: tc.handler, - } - got := p.perform(context.Background(), task) - if tc.IsPanicError != IsPanicError(got) { - t.Errorf("%s: got=%t, want=%t", tc.name, IsPanicError(got), tc.IsPanicError) - } - if tc.IsPanicError && !strings.HasPrefix(got.Error(), "panic error cause by:") { - t.Error("wrong text msg for panic error") - } - }) - } -} diff --git a/server.go b/server.go index e31ce2f..2dfaf71 100644 --- a/server.go +++ b/server.go @@ -162,16 +162,6 @@ type Config struct { // }) // // ErrorHandler: asynq.ErrorHandlerFunc(reportError) - - // we can also handle panic error like: - // func reportError(ctx context, task *asynq.Task, err error) { - // if asynq.IsPanic(err) { - // errorReportingService.Notify(err) - // } - // }) - // - // ErrorHandler: asynq.ErrorHandlerFunc(reportError) - ErrorHandler ErrorHandler // Logger specifies the logger used by the server instance.