feat: improve retry handling and logging in tasks

- Add RetryFactor, RetryMin, and RetryMax fields to NewMessage and NewTask functions
- Update AllowOption struct to have public fields and adjust references in NewOptions function
- Add test cases for RetryMin, RetryMax, and RetryFactor in job_test.go and option_test.go
- Log retry remaining times and delay time in queue.go

Signed-off-by: appleboy <[email protected]>

Author: appleboy

job/job.go

@@ -68,21 +68,27 @@ func NewMessage(m core.QueuedMessage, opts ...AllowOption) *Message {
 	o := NewOptions(opts...)
 
 	return &Message{
-		RetryCount: o.retryCount,
-		RetryDelay: o.retryDelay,
-		Timeout:    o.timeout,
-		Payload:    m.Bytes(),
+		RetryCount:  o.retryCount,
+		RetryDelay:  o.retryDelay,
+		RetryFactor: o.retryFactor,
+		RetryMin:    o.retryMin,
+		RetryMax:    o.retryMax,
+		Timeout:     o.timeout,
+		Payload:     m.Bytes(),
 	}
 }
 
 func NewTask(task TaskFunc, opts ...AllowOption) *Message {
 	o := NewOptions(opts...)
 
 	return &Message{
-		Timeout:    o.timeout,
-		RetryCount: o.retryCount,
-		RetryDelay: o.retryDelay,
-		Task:       task,
+		Timeout:     o.timeout,
+		RetryCount:  o.retryCount,
+		RetryDelay:  o.retryDelay,
+		RetryFactor: o.retryFactor,
+		RetryMin:    o.retryMin,
+		RetryMax:    o.retryMax,
+		Task:        task,
 	}
 }
 

job/job_test.go

@@ -23,6 +23,7 @@ func TestMessageEncodeDecode(t *testing.T) {
 			RetryCount: Int64(100),
 			RetryDelay: Time(30 * time.Millisecond),
 			Timeout:    Time(3 * time.Millisecond),
+			RetryMin:   Time(200 * time.Millisecond),
 		},
 	)
 
@@ -33,4 +34,7 @@ func TestMessageEncodeDecode(t *testing.T) {
 	assert.Equal(t, 30*time.Millisecond, out.RetryDelay)
 	assert.Equal(t, 3*time.Millisecond, out.Timeout)
 	assert.Equal(t, "foo", string(out.Payload))
+	assert.Equal(t, 200*time.Millisecond, out.RetryMin)
+	assert.Equal(t, 10*time.Second, out.RetryMax)
+	assert.Equal(t, 2.0, out.RetryFactor)
 }

job/option.go

@@ -26,9 +26,9 @@ func newDefaultOptions() Options {
 type AllowOption struct {
 	RetryCount  *int64
 	RetryDelay  *time.Duration
-	retryFactor *float64
-	retryMin    *time.Duration
-	retryMax    *time.Duration
+	RetryFactor *float64
+	RetryMin    *time.Duration
+	RetryMax    *time.Duration
 	Timeout     *time.Duration
 }
 
@@ -49,16 +49,16 @@ func NewOptions(opts ...AllowOption) Options {
 			o.timeout = *opts[0].Timeout
 		}
 
-		if opts[0].retryFactor != nil && *opts[0].retryFactor != o.retryFactor {
-			o.retryFactor = *opts[0].retryFactor
+		if opts[0].RetryFactor != nil && *opts[0].RetryFactor != o.retryFactor {
+			o.retryFactor = *opts[0].RetryFactor
 		}
 
-		if opts[0].retryMin != nil && *opts[0].retryMin != o.retryMin {
-			o.retryMin = *opts[0].retryMin
+		if opts[0].RetryMin != nil && *opts[0].RetryMin != o.retryMin {
+			o.retryMin = *opts[0].RetryMin
 		}
 
-		if opts[0].retryMax != nil && *opts[0].retryMax != o.retryMax {
-			o.retryMax = *opts[0].retryMax
+		if opts[0].RetryMax != nil && *opts[0].RetryMax != o.retryMax {
+			o.retryMax = *opts[0].RetryMax
 		}
 	}
 

job/option_test.go

@@ -19,4 +19,7 @@ func TestOptions(t *testing.T) {
 	assert.Equal(t, int64(100), o.retryCount)
 	assert.Equal(t, 30*time.Millisecond, o.retryDelay)
 	assert.Equal(t, 3*time.Millisecond, o.timeout)
+	assert.Equal(t, 100*time.Millisecond, o.retryMin)
+	assert.Equal(t, 10*time.Second, o.retryMax)
+	assert.Equal(t, 2.0, o.retryFactor)
 }

queue.go

@@ -225,6 +225,7 @@ func (q *Queue) handle(m *job.Message) error {
 
 			select {
 			case <-time.After(delay): // retry delay
+				q.logger.Infof("retry remaining times: %d, delay time: %s", m.RetryCount, delay)
 			case <-ctx.Done(): // timeout reached
 				err = ctx.Err()
 				break loop