diff --git a/app/Jobs/CaptureBaselineSnapshotJob.php b/app/Jobs/CaptureBaselineSnapshotJob.php index f1c175f..1b6cc7f 100644 --- a/app/Jobs/CaptureBaselineSnapshotJob.php +++ b/app/Jobs/CaptureBaselineSnapshotJob.php @@ -41,6 +41,8 @@ class CaptureBaselineSnapshotJob implements ShouldQueue { use Dispatchable, InteractsWithQueue, Queueable, SerializesModels; + public int $timeout = 300; + public ?OperationRun $operationRun = null; public function __construct( diff --git a/app/Jobs/CompareBaselineToTenantJob.php b/app/Jobs/CompareBaselineToTenantJob.php index 2571ea5..f3d274c 100644 --- a/app/Jobs/CompareBaselineToTenantJob.php +++ b/app/Jobs/CompareBaselineToTenantJob.php @@ -58,6 +58,8 @@ class CompareBaselineToTenantJob implements ShouldQueue { use Dispatchable, InteractsWithQueue, Queueable, SerializesModels; + public int $timeout = 300; + /** * @var array */ diff --git a/config/queue.php b/config/queue.php index 79c2c0a..8122132 100644 --- a/config/queue.php +++ b/config/queue.php @@ -40,7 +40,7 @@ 'connection' => env('DB_QUEUE_CONNECTION'), 'table' => env('DB_QUEUE_TABLE', 'jobs'), 'queue' => env('DB_QUEUE', 'default'), - 'retry_after' => (int) env('DB_QUEUE_RETRY_AFTER', 90), + 'retry_after' => (int) env('DB_QUEUE_RETRY_AFTER', 600), 'after_commit' => false, ], @@ -48,7 +48,7 @@ 'driver' => 'beanstalkd', 'host' => env('BEANSTALKD_QUEUE_HOST', 'localhost'), 'queue' => env('BEANSTALKD_QUEUE', 'default'), - 'retry_after' => (int) env('BEANSTALKD_QUEUE_RETRY_AFTER', 90), + 'retry_after' => (int) env('BEANSTALKD_QUEUE_RETRY_AFTER', 600), 'block_for' => 0, 'after_commit' => false, ], @@ -68,7 +68,7 @@ 'driver' => 'redis', 'connection' => env('REDIS_QUEUE_CONNECTION', 'default'), 'queue' => env('REDIS_QUEUE', 'default'), - 'retry_after' => (int) env('REDIS_QUEUE_RETRY_AFTER', 90), + 'retry_after' => (int) env('REDIS_QUEUE_RETRY_AFTER', 600), 'block_for' => null, 'after_commit' => false, ], diff --git a/tests/Feature/Operations/BaselineQueueRuntimeGuardTest.php b/tests/Feature/Operations/BaselineQueueRuntimeGuardTest.php new file mode 100644 index 0000000..ca4727c --- /dev/null +++ b/tests/Feature/Operations/BaselineQueueRuntimeGuardTest.php @@ -0,0 +1,20 @@ +timeout, $compareJob->timeout); + + expect($captureJob->timeout)->toBe(300) + ->and($compareJob->timeout)->toBe(300) + ->and($databaseRetryAfter)->toBeGreaterThan($maximumJobTimeout) + ->and($databaseRetryAfter)->toBeGreaterThanOrEqual(600); +});