Merge pull request #60 from tractorcow/pulls/fix-all-the-things

BUG fix merge regressions from #49
symbiote · Aug 25, 2015 · 52c081c · 52c081c
2 parents 20dc536 + 97c8dce
commit 52c081c
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/code/services/QueuedJobService.php b/code/services/QueuedJobService.php
@@ -120,7 +120,10 @@ public function queueJob(QueuedJob $job, $startAfter = null, $userId = null, $qu
 		// see if we already have this job in a queue
 		$filter = array(
 			'Signature' => $signature,
-			'JobStatus' => QueuedJob::STATUS_NEW,
+			'JobStatus' => array(
+				QueuedJob::STATUS_NEW,
+				QueuedJob::STATUS_INIT
+			)
 		);
 
 		$existing = DataList::create('QueuedJobDescriptor')->filter($filter)->first();
@@ -402,7 +405,7 @@ protected function grabMutex(QueuedJobDescriptor $jobDescriptor) {
 			return false;
 		}
 
-		if(DB::getConn()->affectedRows() === 0) {
+		if(DB::getConn()->affectedRows() === 0 && $jobDescriptor->JobStatus !== QueuedJob::STATUS_INIT) {
 			return false;
 		}