Change ErrorHandler function signature

The command converts all messages in redis to be compatible for asynq
v0.10.0

CHANGELOG.md

@@ -7,8 +7,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-## [0.10.0] - 2020-07-06
-
 ### Changed
 
 - All tasks now requires timeout or deadline. By default, timeout is set to 30 mins.

README.md

@@ -34,7 +34,6 @@ A system can consist of multiple worker servers and brokers, giving way to high
 - Scheduling of tasks
 - Durability since tasks are written to Redis
 - [Retries](https://github.com/hibiken/asynq/wiki/Task-Retry) of failed tasks
-- Automatic recovery of tasks in the event of a worker crash
 - [Weighted priority queues](https://github.com/hibiken/asynq/wiki/Priority-Queues#weighted-priority-queues)
 - [Strict priority queues](https://github.com/hibiken/asynq/wiki/Priority-Queues#strict-priority-queues)
 - Low latency to add a task since writes are fast in Redis

processor.go

@@ -191,19 +191,9 @@ func (p *processor) exec() {
 				p.cancelations.Delete(msg.ID.String())
 			}()
 
-			// check context before starting a worker goroutine.
-			select {
-			case <-ctx.Done():
-				// already canceled (e.g. deadline exceeded).
-				p.retryOrKill(ctx, msg, ctx.Err())
-				return
-			default:
-			}
-
 			resCh := make(chan error, 1)
-			go func() {
-				resCh <- perform(ctx, NewTask(msg.Type, msg.Payload), p.handler)
-			}()
+			task := NewTask(msg.Type, msg.Payload)
+			go func() { resCh <- perform(ctx, task, p.handler) }()
 
 			select {
 			case <-p.abort:
@@ -212,6 +202,7 @@ func (p *processor) exec() {
 				p.requeue(msg)
 				return
 			case <-ctx.Done():
+				p.logger.Debugf("Retrying task. task id=%s", msg.ID) // TODO: Improve this log message and above
 				p.retryOrKill(ctx, msg, ctx.Err())
 				return
 			case resErr := <-resCh:
@@ -220,6 +211,9 @@ func (p *processor) exec() {
 				// 2) Retry -> Removes the message from InProgress & Adds the message to Retry
 				// 3) Kill  -> Removes the message from InProgress & Adds the message to Dead
 				if resErr != nil {
+					if p.errHandler != nil {
+						p.errHandler.HandleError(ctx, task, resErr)
+					}
 					p.retryOrKill(ctx, msg, resErr)
 					return
 				}
@@ -258,11 +252,7 @@ func (p *processor) markAsDone(ctx context.Context, msg *base.TaskMessage) {
 }
 
 func (p *processor) retryOrKill(ctx context.Context, msg *base.TaskMessage, err error) {
-	if p.errHandler != nil {
-		p.errHandler.HandleError(ctx, NewTask(msg.Type, msg.Payload), err)
-	}
 	if msg.Retried >= msg.Retry {
-		p.logger.Warnf("Retry exhausted for task id=%s", msg.ID)
 		p.kill(ctx, msg, err)
 	} else {
 		p.retry(ctx, msg, err)
@@ -291,6 +281,7 @@ func (p *processor) retry(ctx context.Context, msg *base.TaskMessage, e error) {
 }
 
 func (p *processor) kill(ctx context.Context, msg *base.TaskMessage, e error) {
+	p.logger.Warnf("Retry exhausted for task id=%s", msg.ID)
 	err := p.broker.Kill(msg, e.Error())
 	if err != nil {
 		errMsg := fmt.Sprintf("Could not move task id=%s from %q to %q", msg.ID, base.InProgressQueue, base.DeadQueue)

server.go

@@ -125,7 +125,7 @@ type Config struct {
 	ShutdownTimeout time.Duration
 }
 
-// An ErrorHandler handles an error occured during task processing.
+// An ErrorHandler handles errors returned by the task handler.
 type ErrorHandler interface {
 	HandleError(ctx context.Context, task *Task, err error)
 }