Switch Locker to Mutex (Close #47)

Author: edgardmessias

src/components/Storage.php

@@ -11,7 +11,6 @@
 namespace hiqdev\assetpackagist\components;
 
 use hiqdev\assetpackagist\exceptions\AssetFileStorageException;
-use hiqdev\assetpackagist\helpers\Locker;
 use hiqdev\assetpackagist\models\AssetPackage;
 use Yii;
 use yii\base\Component;
@@ -30,26 +29,35 @@ public function init()
         $this->_path = Yii::getAlias('@storage', false);
     }
 
-    protected function getLocker()
+    protected function acquireLock()
     {
-        if ($this->_locker === null) {
-            $this->_locker = Locker::getInstance($this->buildPath('lock')); // TODO: get rid of singleton
+        /* @var $mutex \yii\mutex\Mutex */
+        $mutex = Yii::$app->mutex;
+
+        if (!$mutex->acquire('lock', 5)) {
+            throw new \Exception('failed get lock');
         }
+    }
+
+    protected function releaseLock()
+    {
+        /* @var $mutex \yii\mutex\Mutex */
+        $mutex = Yii::$app->mutex;
 
-        return $this->_locker;
+        $mutex->release('lock');
     }
 
     /**
      * {@inheritdoc}
      */
     public function getNextId()
     {
-        $this->getLocker()->lock();
+        $this->acquireLock();
         {
             $nextID = $this->readLastId() + 1;
             $this->writeLastId($nextID);
         }
-        $this->getLocker()->release();
+        $this->releaseLock();
 
         return $nextID;
     }
@@ -89,7 +97,7 @@ public function writePackage(AssetPackage $package)
         $path = $this->buildHashedPath($name, $hash);
         $latestPath = $this->buildHashedPath($name);
         if (!file_exists($path)) {
-            $this->getLocker()->lock();
+            $this->acquireLock();
             try {
                 if ($this->mkdir(dirname($path)) === false) {
                     throw new AssetFileStorageException('Failed to create a directory for asset-package', $package);
@@ -102,7 +110,7 @@ public function writePackage(AssetPackage $package)
                 }
                 $this->writeProviderLatest($name, $hash);
             } finally {
-                $this->getLocker()->release();
+                $this->releaseLock();
             }
         } else {
             touch($latestPath);
@@ -162,7 +170,7 @@ protected function writeProviderLatest($name, $hash)
         $path = $this->buildHashedPath('provider-latest', $hash);
 
         if (!file_exists($path)) {
-            $this->getLocker()->lock();
+            $this->acquireLock();
 
             try {
                 if ($this->mkdir(dirname($path)) === false) {
@@ -176,7 +184,7 @@ protected function writeProviderLatest($name, $hash)
                 }
                 $this->writePackagesJson($hash);
             } finally {
-                $this->getLocker()->release();
+                $this->releaseLock();
             }
         } else {
             touch($latestPath);
@@ -195,15 +203,15 @@ protected function writePackagesJson($hash)
                 ],
             ],
         ];
-        $this->getLocker()->lock();
+        $this->acquireLock();
         $filename = $this->buildPath('packages.json');
         try {
             if (file_put_contents($filename, Json::encode($data)) === false) {
                 throw new AssetFileStorageException('Failed to write main packages.json');
             }
             touch($filename);
         } finally {
-            $this->getLocker()->release();
+            $this->releaseLock();
         }
     }
 

src/config/common.php

@@ -24,12 +24,16 @@
             'password' => $params['db.password'],
             'charset' => 'utf8',
         ],
+        'mutex' => [
+            'class' => \yii\mutex\MysqlMutex::class,
+            'db' => 'db',
+        ],
         'queue' => [
             'class' => \zhuravljov\yii\queue\db\Queue::class,
             'db' => 'db',
             'tableName' => '{{%queue}}',
             'channel' => 'package',
-            'mutex' => \yii\mutex\MysqlMutex::class,
+            'mutex' => 'mutex',
             'deleteReleased' => true,
         ],
         'packageStorage' => [