[Bug] Removed WithoutOverlapping middleware and refactored to use SkipIfBatchCancelled (alexjustesen#2030)

Author: alexjustesen

app/Jobs/CheckForInternetConnectionJob.php

@@ -10,6 +10,7 @@
 use Illuminate\Bus\Batchable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Queue\Queueable;
+use Illuminate\Queue\Middleware\SkipIfBatchCancelled;
 
 class CheckForInternetConnectionJob implements ShouldQueue
 {
@@ -22,15 +23,21 @@ public function __construct(
         public Result $result,
     ) {}
 
+    /**
+     * Get the middleware the job should pass through.
+     */
+    public function middleware(): array
+    {
+        return [
+            new SkipIfBatchCancelled,
+        ];
+    }
+
     /**
      * Execute the job.
      */
     public function handle(): void
     {
-        if ($this->batch()->cancelled()) {
-            return;
-        }
-
         $this->result->update([
             'status' => ResultStatus::Checking,
         ]);

app/Jobs/Ookla/BenchmarkSpeedtestJob.php

@@ -10,6 +10,7 @@
 use Illuminate\Bus\Batchable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Queue\Queueable;
+use Illuminate\Queue\Middleware\SkipIfBatchCancelled;
 use Illuminate\Support\Arr;
 
 class BenchmarkSpeedtestJob implements ShouldQueue
@@ -25,14 +26,24 @@ public function __construct(
         public Result $result,
     ) {}
 
+    /**
+     * Get the middleware the job should pass through.
+     */
+    public function middleware(): array
+    {
+        return [
+            new SkipIfBatchCancelled,
+        ];
+    }
+
     /**
      * Execute the job.
      */
     public function handle(): void
     {
         $settings = app(ThresholdSettings::class);
 
-        if ($this->batch()->cancelled() || $settings->absolute_enabled == false) {
+        if ($settings->absolute_enabled == false) {
             return;
         }
 

app/Jobs/Ookla/CompleteSpeedtestJob.php

@@ -8,6 +8,7 @@
 use Illuminate\Bus\Batchable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Queue\Queueable;
+use Illuminate\Queue\Middleware\SkipIfBatchCancelled;
 
 class CompleteSpeedtestJob implements ShouldQueue
 {
@@ -20,15 +21,21 @@ public function __construct(
         public Result $result,
     ) {}
 
+    /**
+     * Get the middleware the job should pass through.
+     */
+    public function middleware(): array
+    {
+        return [
+            new SkipIfBatchCancelled,
+        ];
+    }
+
     /**
      * Execute the job.
      */
     public function handle(): void
     {
-        if ($this->batch()->cancelled()) {
-            return;
-        }
-
         $this->result->update([
             'status' => ResultStatus::Completed,
         ]);

app/Jobs/Ookla/RunSpeedtestJob.php

@@ -10,7 +10,7 @@
 use Illuminate\Bus\Batchable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Queue\Queueable;
-use Illuminate\Queue\Middleware\WithoutOverlapping;
+use Illuminate\Queue\Middleware\SkipIfBatchCancelled;
 use Illuminate\Support\Arr;
 use Symfony\Component\Process\Exception\ProcessFailedException;
 use Symfony\Component\Process\Process;
@@ -40,18 +40,16 @@ public function __construct(
      */
     public function middleware(): array
     {
-        return [new WithoutOverlapping('run-speedtest')];
+        return [
+            new SkipIfBatchCancelled,
+        ];
     }
 
     /**
      * Execute the job.
      */
     public function handle(): void
     {
-        if ($this->batch()->cancelled()) {
-            return;
-        }
-
         $this->result->update([
             'status' => ResultStatus::Running,
         ]);

app/Jobs/Ookla/SelectSpeedtestServerJob.php

@@ -6,6 +6,7 @@
 use Illuminate\Bus\Batchable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Queue\Queueable;
+use Illuminate\Queue\Middleware\SkipIfBatchCancelled;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Log;
 use Symfony\Component\Process\Exception\ProcessFailedException;
@@ -22,15 +23,21 @@ public function __construct(
         public Result $result,
     ) {}
 
+    /**
+     * Get the middleware the job should pass through.
+     */
+    public function middleware(): array
+    {
+        return [
+            new SkipIfBatchCancelled,
+        ];
+    }
+
     /**
      * Execute the job.
      */
     public function handle(): void
     {
-        if ($this->batch()->cancelled()) {
-            return;
-        }
-
         // If the server id is already set, we don't need to do anything.
         if (Arr::get($this->result->data, 'server.id')) {
             return;

app/Jobs/Ookla/SkipSpeedtestJob.php

@@ -10,6 +10,7 @@
 use Illuminate\Bus\Batchable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Queue\Queueable;
+use Illuminate\Queue\Middleware\SkipIfBatchCancelled;
 
 class SkipSpeedtestJob implements ShouldQueue
 {
@@ -22,15 +23,21 @@ public function __construct(
         public Result $result,
     ) {}
 
+    /**
+     * Get the middleware the job should pass through.
+     */
+    public function middleware(): array
+    {
+        return [
+            new SkipIfBatchCancelled,
+        ];
+    }
+
     /**
      * Execute the job.
      */
     public function handle(): void
     {
-        if ($this->batch()->cancelled()) {
-            return;
-        }
-
         /**
          * Only skip IPs for scheduled tests.
          */