Merge pull request #14 from frain-dev/ogban/feat/pause-retries-for-ratelimit-error

handle error before logging

Author: ogbanugot

brokers/localstorage/localstorage.go

@@ -85,8 +85,8 @@ func (b *LocalStorage) Process(msg *disq.Message) error {
 
 	if msgErr != nil {
 		//retry
-		disq.Logger.Println(disq.FormatHandlerError(msg, task.RetryLimit()))
 		_ = disq.ErrorHandler(msg, msgErr, &b.retries)
+		disq.Logger.Println(disq.FormatHandlerError(msg, task.RetryLimit()))
 		msg.Err = msgErr
 		err := b.Requeue(msg)
 		if err != nil {

brokers/redis/list.go

@@ -103,8 +103,8 @@ func (b *List) Process(msg *disq.Message) error {
 	msgErr := task.HandleMessage(msg)
 
 	if msgErr != nil {
-		disq.Logger.Println(disq.FormatHandlerError(msg, task.RetryLimit()))
 		_ = disq.ErrorHandler(msg, msgErr, &b.retries)
+		disq.Logger.Println(disq.FormatHandlerError(msg, task.RetryLimit()))
 		msg.Err = msgErr
 		err := b.Requeue(msg)
 		if err != nil {

brokers/redis/stream.go

@@ -125,8 +125,8 @@ func (b *Stream) Process(msg *disq.Message) error {
 
 	if msgErr != nil {
 		//retry
-		disq.Logger.Println(disq.FormatHandlerError(msg, task.RetryLimit()))
 		_ = disq.ErrorHandler(msg, msgErr, &b.retries)
+		disq.Logger.Println(disq.FormatHandlerError(msg, task.RetryLimit()))
 		msg.Err = msgErr
 		err := b.Requeue(msg)
 		if err != nil {

util.go

@@ -40,6 +40,6 @@ func StringToBytes(s string) []byte {
 }
 
 func FormatHandlerError(msg *Message, retrylimit int) error {
-	return fmt.Errorf("task=%q failed (retrycount=%d/%d will retry after delay=%s): reason:%s",
+	return fmt.Errorf("task=%q failed (retry=%d/%d, delay=%s): reason:%s",
 		msg.TaskName, msg.RetryCount, retrylimit, msg.Delay, msg.Err)
 }