Merge branch '4.0' into 4.1

symbiote · May 27, 2019 · d0fb2e2 · d0fb2e2
2 parents c7d3fcb + b7b5624
commit d0fb2e2
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/Services/QueuedJobService.php b/src/Services/QueuedJobService.php
@@ -9,7 +9,6 @@
 use SilverStripe\Control\Email\Email;
 use SilverStripe\Core\Config\Config;
 use SilverStripe\Core\Config\Configurable;
-use SilverStripe\Core\Convert;
 use SilverStripe\Core\Extensible;
 use SilverStripe\Core\Injector\Injectable;
 use SilverStripe\Core\Injector\Injector;
@@ -551,15 +550,18 @@ protected function grabMutex(QueuedJobDescriptor $jobDescriptor)
         // and thus the row would always be affected.
         try {
             DB::query(sprintf(
-                'UPDATE "QueuedJobDescriptor" SET "JobStatus" = \'%s\' WHERE "ID" = %s',
+                'UPDATE "QueuedJobDescriptor" SET "JobStatus" = \'%s\' WHERE "ID" = %s'
+                . ' AND "JobFinished" IS NULL AND "JobStatus" NOT IN (%s)',
                 QueuedJob::STATUS_INIT,
-                $jobDescriptor->ID
+                $jobDescriptor->ID,
+                "'" . QueuedJob::STATUS_RUN . "', '" . QueuedJob::STATUS_COMPLETE . "', '"
+                . QueuedJob::STATUS_PAUSED . "', '" . QueuedJob::STATUS_CANCELLED . "'"
             ));
         } catch (Exception $e) {
             return false;
         }
 
-        if (DB::getConn()->affectedRows() === 0 && $jobDescriptor->JobStatus !== QueuedJob::STATUS_INIT) {
+        if (DB::get_conn()->affectedRows() === 0 && $jobDescriptor->JobStatus !== QueuedJob::STATUS_INIT) {
             return false;
         }