Improve retry logic and logs

e2e/Makefile

@@ -54,7 +54,7 @@ up: clone down
 	docker-compose exec -T app sh -c 'php craft project-config/rebuild'
 	docker-compose exec -T app sh -c 'php craft up'
 	docker-compose exec -T app sh -c 'php craft migrate/up'
-	docker-compose exec -T app sh -c 'php craft queue/run'
+	docker-compose exec -T app sh -c 'nohup ./queue_listen.sh > queue.log 2>&1 &'
 
 cli:
 	docker-compose exec -T app sh

e2e/docker-compose.yml

@@ -28,12 +28,19 @@ services:
       MOCKSERVER_CORS_ALLOW_METHODS: "CONNECT, DELETE, GET, HEAD, OPTIONS, POST, PUT, PATCH, TRACE"
     networks:
       - e2e-network
+
+  mockserver-healthcheck:
+    image: alpine:latest
     healthcheck:
-      test: [ "CMD-SHELL", "curl --fail http://localhost:1080/status" ]
+      test: ["CMD-SHELL", "curl --fail -XPUT http://mockserver:1080/status || exit 1"]
       interval: 5s
       timeout: 5s
       retries: 3
-    restart: on-failure
+    depends_on:
+      - mockserver
+    networks:
+      - e2e-network
+    entrypoint: ["sh", "-c", "apk add --no-cache curl && while sleep 3600; do :; done"]
 
 networks:
   e2e-network:

e2e/happy-lager-override/config/general.php

@@ -38,6 +38,7 @@
 
     // Whether crawlers should be allowed to index pages and following links
     'disallowRobots' => !$isProd,
+    'runQueueAutomatically' => false,
 
     'aliases' => [
         '@assetBasePath' => App::env('ASSET_BASE_PATH') ?: "./assets",

e2e/happy-lager-override/queue_listen.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+while true; do
+    echo "Starting the queue listen process..."
+    php craft queue/listen -v
+    echo "Queue listen completed. Restarting in 30 seconds..."
+    sleep 1
+done

src/controllers/job/PostJobRetryController.php

@@ -5,12 +5,24 @@
 namespace lilthq\craftliltplugin\controllers\job;
 
 use Craft;
+use craft\errors\ElementNotFoundException;
 use craft\web\Controller;
+use LiltConnectorSDK\ApiException;
 use lilthq\craftliltplugin\Craftliltplugin;
+use Throwable;
+use yii\base\Exception;
+use yii\db\StaleObjectException;
 use yii\web\Response;
 
 class PostJobRetryController extends Controller
 {
+    /**
+     * @throws ElementNotFoundException
+     * @throws Throwable
+     * @throws ApiException
+     * @throws StaleObjectException
+     * @throws Exception
+     */
     public function actionInvoke(): Response
     {
         $request = Craft::$app->getRequest();

src/modules/AbstractRetryJob.php

@@ -37,6 +37,9 @@ abstract class AbstractRetryJob extends BaseJob
      */
     abstract public function canRetry(): bool;
 
+    /**
+     * @return SendJobToConnector|SendTranslationToConnector|FetchJobStatusFromConnector|FetchTranslationFromConnector
+     */
     abstract public function getRetryJob(): BaseJob;
 
     protected function getCommand(): ?Command

src/modules/FetchJobStatusFromConnector.php

@@ -27,7 +27,7 @@ class FetchJobStatusFromConnector extends AbstractRetryJob
     public const PRIORITY = 1024;
     public const TTR = 60 * 30;
 
-    private const RETRY_COUNT = 3;
+    private const RETRY_COUNT = 10;
 
     /**
      * @var int $liltJobId

src/modules/FetchTranslationFromConnector.php

@@ -29,7 +29,7 @@ class FetchTranslationFromConnector extends AbstractRetryJob
     public const PRIORITY = 2048;
     public const TTR = 60 * 30;
 
-    private const RETRY_COUNT = 3;
+    private const RETRY_COUNT = 10;
 
     /**
      * @var int $liltJobId