Added a lock file to the document processor to prevent multiple occurrences of t…

…he indexing taking place at the same time, which could cause race conditions. Committed by: Megan Watson

Added a lock file to the document processor to prevent multiple occurrences of t…
…he indexing taking place at the same time, which could cause race conditions. Committed by: Megan Watson
Megan
1 parent 95ff3c27
Showing 1 changed file with 19 additions and 0 deletions
search2/documentProcessor/documentProcessor.inc.php
@@ -144,6 +144,16 @@ class DocumentProcessor
         global $default;
         $default->log->debug('documentProcessor: starting');
  
+        // Check for lock file to ensure processor is not currently running
+        $cacheDir = $default->cacheDirectory;
+        $lockFile = $cacheDir . DIRECTORY_SEPARATOR . 'document_processor.lock';
+
+        if(file_exists($lockFile)){
+            // lock file exists, exit
+            $default->log->debug('documentProcessor: stopping, lock file in place '.$lockFile);
+            return ;
+        }
+
         if($default->enableIndexing){
             // Setup indexing - load extractors, run diagnostics
             if($this->indexer->preIndexingSetup() === false){
@@ -160,6 +170,10 @@ class DocumentProcessor
             return ;
         }
  
+        // indexing starting - create lock file
+        touch($lockFile);
+
+
         // Process queue
         foreach($queue as $item){
  
@@ -198,6 +212,11 @@ class DocumentProcessor
         // update the indexer statistics
         $this->indexer->updateIndexStats();
  
+        // Remove lock file to indicate processing has completed
+        if(file_exists($lockFile)){
+            @unlink($lockFile);
+        }
+
         $default->log->debug('documentProcessor: stopping');
     }