tonyair/silverstripe-fulltextsearch
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-fulltextsearch synced 2024-10-22 12:05:29 +00:00
Code Issues Projects Releases Wiki Activity

API Only allow one scheduled commit job at a time

Browse Source
This commit is contained in:
Damian Mooyman 2015-05-11 16:35:43 +12:00
parent 60b05db1ce
commit 16a6f362e2
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
code/search/processors/SearchUpdateCommitJobProcessor.php
View File

@ -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 * @param boolean $dirty Marks all indexes as dirty by default. Set to false if there are known comitted and
* clean indexes * clean indexes
* @param string $startAfter Start date * @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) { public static function queue($dirty = true, $startAfter = null) {
$commit = Injector::inst()->create(__CLASS__); $commit = Injector::inst()->create(__CLASS__);
singleton('QueuedJobService')->queueJob($commit, $startAfter); $id = singleton('QueuedJobService')->queueJob($commit, $startAfter);
if($dirty) { if($dirty) {
$indexes = FullTextSearch::get_indexes(); $indexes = FullTextSearch::get_indexes();
static::$dirty_indexes = array_keys($indexes); static::$dirty_indexes = array_keys($indexes);
} }
return $commit; return $id;
} }
public function getJobType() { public function getJobType() {
@ -92,7 +92,9 @@ class SearchUpdateCommitJobProcessor implements QueuedJob {
} }
public function getSignature() { 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() { public function getTitle() {

1
tests/BatchedProcessorTest.php
View File

@ -22,6 +22,7 @@ class BatchedProcessor_QueuedJobService {
'job' => $job, 'job' => $job,
'startAfter' => $startAfter 'startAfter' => $startAfter
); );
return $job;
} }
public function getJobs() { public function getJobs() {