From 16a6f362e2714212431aeddbacd11ba8290551cf Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Mon, 11 May 2015 16:35:43 +1200
Subject: [PATCH] API Only allow one scheduled commit job at a time

---
 .../processors/SearchUpdateCommitJobProcessor.php      | 10 ++++++----
 tests/BatchedProcessorTest.php                         |  1 +
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/code/search/processors/SearchUpdateCommitJobProcessor.php b/code/search/processors/SearchUpdateCommitJobProcessor.php
index fde3382..f14743c 100644
--- a/code/search/processors/SearchUpdateCommitJobProcessor.php
+++ b/code/search/processors/SearchUpdateCommitJobProcessor.php
@@ -74,17 +74,17 @@ class SearchUpdateCommitJobProcessor implements QueuedJob {
 	 * @param boolean $dirty Marks all indexes as dirty by default. Set to false if there are known comitted and
 	 * clean indexes
 	 * @param string $startAfter Start date
-	 * @return static The queued job
+	 * @return int The ID of the next queuedjob to run. This could be a new one or an existing one.
 	 */
 	public static function queue($dirty = true, $startAfter = null) {
 		$commit = Injector::inst()->create(__CLASS__);
-		singleton('QueuedJobService')->queueJob($commit, $startAfter);
+		$id = singleton('QueuedJobService')->queueJob($commit, $startAfter);
 
 		if($dirty) {
 			$indexes = FullTextSearch::get_indexes();
 			static::$dirty_indexes = array_keys($indexes);
 		}
-		return $commit;
+		return $id;
 	}
 
 	public function getJobType() {
@@ -92,7 +92,9 @@ class SearchUpdateCommitJobProcessor implements QueuedJob {
 	}
 
 	public function getSignature() {
-		return md5(get_class($this) . time() . mt_rand(0, 100000));
+		// There is only ever one commit job on the queue so the signature is consistent
+		// See QueuedJobService::queueJob() for the code that prevents duplication
+		return __CLASS__;
 	}
 
 	public function getTitle() {
diff --git a/tests/BatchedProcessorTest.php b/tests/BatchedProcessorTest.php
index 939cead..6f53807 100644
--- a/tests/BatchedProcessorTest.php
+++ b/tests/BatchedProcessorTest.php
@@ -22,6 +22,7 @@ class BatchedProcessor_QueuedJobService {
 			'job' => $job,
 			'startAfter' => $startAfter
 		);
+		return $job;
 	}
 
 	public function getJobs() {