Changeset 1332

Timestamp:

Sep 7, 2010, 1:53:52 PM (11 years ago)

Author:

teymour

Message:

Résolution du pb de semaphore pointé par Roux

Location:

cpc/trunk/project

Files:

• lib/model/solr/SolrCommands.class.php (modified) (1 diff)
• lib/model/solr/SolrConnector.class.php (modified) (2 diffs)
• lib/model/solr/SolrListener.php (modified) (3 diffs)
• test/unit/solrableTest.php (modified) (1 diff)

cpc/trunk/project/lib/model/solr/SolrCommands.class.php

@@ -7 +7 @@
   }
 
-  protected static $semaphore = null;
-  protected static $file = null; 
+  protected $semaphore = null;
+  protected $file = null; 
 
-  protected static function getSemaphore() {
-    if (! self::$semaphore) {
-      self::$semaphore = sem_get(rand());
+  protected static $instance = null;
+  protected static $semaphore_id = "99999910823498202340982340982340981678";
+  public static function getInstance() {
+    if (!self::$instance) {
+      self::$instance = new SolrCommands();
     }
-    return self::$semaphore;
+    return self::$instance;
   }
 
-  public static function addCommand($status, $json) {
-    sem_acquire(self::getSemaphore());
-    if (! self::$file) {
-      self::$file = fopen(self::getFileCommands(), 'a+');
+  public function __construct() {
+    $this->semaphore = sem_get(self::$semaphore_id);
+  }
+
+  public function __destruct() {
+    sem_remove($this->semaphore);
+    $this->semaphore = null;
+  }
+
+  public function addCommand($status, $json) {
+    sem_acquire($this->semaphore);
+    if (! $this->file) {
+      $this->file = fopen($this->getFileCommands(), 'a+');
     }
     $str = $status.' : '.json_encode($json)."\n";
-    fwrite(self::$file, $str, strlen($str));
-    sem_release(self::getSemaphore());
+    fwrite($this->file, $str, strlen($str));
+    sem_release($this->semaphore);
   }
 
-  public static function getCommandContent() {
-    $lockfile = self::getFileCommands().'.lock';
+  public  function getCommandContent() {
+    $lockfile = $this->getFileCommands().'.lock';
     if (file_exists($lockfile)) {
       return $lockfile;
     }
-    sem_acquire(self::getSemaphore());
-    if (!self::$file) {
+    sem_acquire($this->semaphore);
+    if (!$this->file) {
       touch($lockfile);
-      sem_release(self::getSemaphore());
+      sem_release($this->semaphore);
       return $lockfile;
     }
-    fclose(self::$file);
-    self::$file = null;
-    rename(self::getFileCommands(), self::getFileCommands().'.lock');
-    sem_release(self::getSemaphore());
+    fclose($this->file);
+    $this->file = null;
+    rename($this->getFileCommands(), $this->getFileCommands().'.lock');
+    sem_release($this->semaphore);
     return $lockfile;
   }
-  public static function releaseCommandContent() {
-    sem_acquire(self::getSemaphore());
-    unlink(self::getFileCommands().'.lock');
-    sem_release(self::getSemaphore());
+  public  function releaseCommandContent() {
+    sem_acquire($this->semaphore);
+    unlink($this->getFileCommands().'.lock');
+    sem_release($this->semaphore);
   }
 }

cpc/trunk/project/lib/model/solr/SolrConnector.class.php

@@ -29 +29 @@
 
   public function updateFromCommands() {
-    $file = SolrCommands::getCommandContent();
+    $file = SolrCommands::getInstance()->getCommandContent();
     foreach(file($file) as $line) {
       if (preg_match('/(UPDATE|DELETE) : (.+)/', $line, $matches)) {
@@ -40 +40 @@
       }
     }
-    SolrCommands::releaseCommandContent();
+    SolrCommands::getInstance()->releaseCommandContent();
   }
 

cpc/trunk/project/lib/model/solr/SolrListener.php

@@ -9 +9 @@
      */
     protected $_options = array();
-
-    protected static $fileCommand = null;
-    protected static $fileDispatcher = null;
-
-    protected static function getFileCommand() {
-      if (!self::$fileDispatcher) {
-        self::$fileDispatcher = new sfEventDispatcher();
-      }
-      if (!self::$fileCommand) {
-        self::$fileCommand = new sfFileLogger(self::$fileDispatcher, array('file' => SolrConnector::getFileCommands()));
-      }
-      return self::$fileCommand;
-    }
 
     private $command = null;
@@ -145 +132 @@
     $json['tags']['weight'] = $extra_weight;
     
-    SolrCommands::addCommand('UPDATE', $json);
+    SolrCommands::getInstance()->addCommand('UPDATE', $json);
   }
   
@@ -154 +141 @@
     $json = new stdClass();
     $json->id = $this->getLuceneObjId($obj);
-    SolrCommands::addCommand('DELETE', $json);
+    SolrCommands::getInstance()->addCommand('DELETE', $json);
   }
   

cpc/trunk/project/test/unit/solrableTest.php

@@ -54 +54 @@
 $q->save();
 
-$i = Doctrine::getTable('Intervention')->find(392980);
-$i->save();
+$iexists = Doctrine::getTable('Intervention')->find(3);
+$iexists->save();
 
 $s->updateFromCommands();