瀏覽代碼

Allow retries on message taking too long errors

Tulir Asokan 3 年之前
父節點
當前提交
4b69c16f1a
共有 1 個文件被更改,包括 1 次插入5 次删除
  1. 1 5
      messagetracking.go

+ 1 - 5
messagetracking.go

@@ -71,12 +71,8 @@ func errorToStatusReason(err error) (reason event.MessageStatusReason, isCertain
 		return event.MessageStatusUnsupported, true, false, true
 	case errors.Is(err, errTimeoutBeforeHandling):
 		return event.MessageStatusTooOld, true, true, true
-	case errors.Is(err, context.DeadlineExceeded):
+	case errors.Is(err, context.DeadlineExceeded), errors.Is(err, errMessageTakingLong):
 		return event.MessageStatusTooOld, false, true, true
-	case errors.Is(err, errMessageTakingLong):
-		// Set can_retry=false here since we'll send another status event allowing the retry later
-		// Technically retrying when this happens is fine, but we'd just ignore it anyway.
-		return event.MessageStatusTooOld, false, false, true
 	case errors.Is(err, errTargetNotFound),
 		errors.Is(err, errTargetIsFake),
 		errors.Is(err, errReactionDatabaseNotFound),