Merge pull request #10 from mathroc/feature/cleanup-identifier

remove $identifier from LockFile

Author: mathroc

spec/TH/Lock/FileLockSpec.php

@@ -81,7 +81,7 @@ public function it_should_throw_if_it_cannot_lock()
 
     public function it_remove_its_lock_file_if_not_locked()
     {
-        $this->beConstructedWith($this->lock_file, FileLock::EXCLUSIVE, FileLock::NON_BLOCKING, null, true);
+        $this->beConstructedWith($this->lock_file, FileLock::EXCLUSIVE, FileLock::NON_BLOCKING, true);
 
         $this->acquire();
         $this->release();
@@ -93,7 +93,7 @@ public function it_remove_its_lock_file_if_not_locked()
 
     public function it_does_not_remove_its_lock_file_if_still_locked()
     {
-        $this->beConstructedWith($this->lock_file, FileLock::SHARED, FileLock::NON_BLOCKING, null, true);
+        $this->beConstructedWith($this->lock_file, FileLock::SHARED, FileLock::NON_BLOCKING, true);
 
         touch($this->lock_file);
         flock(fopen($this->lock_file, 'r'), LOCK_SH|LOCK_NB);
@@ -108,7 +108,7 @@ public function it_does_not_remove_its_lock_file_if_still_locked()
 
     public function it_can_acquire_then_release_and_acquire_again()
     {
-        $this->beConstructedWith($this->lock_file, FileLock::EXCLUSIVE, FileLock::NON_BLOCKING, null, true);
+        $this->beConstructedWith($this->lock_file, FileLock::EXCLUSIVE, FileLock::NON_BLOCKING, true);
 
         $this->acquire();
         $this->release();

src/FileFactory.php

@@ -45,7 +45,7 @@ public function create(
 
         $path = $this->lock_dir.'/'.hash($this->hash_algo, serialize($resource)).'.lock';
 
-        $lock = new FileLock($path, $exclusive, $blocking, $resource, true, $this->logger);
+        $lock = new FileLock($path, $exclusive, $blocking, true, $this->logger);
 
         return $lock;
     }

src/FileLock.php

@@ -17,7 +17,6 @@ class FileLock implements Lock
     private $lock_file;
     private $exclusive;
     private $blocking;
-    private $identifier;
     private $fh;
     private $remove_on_release;
 
@@ -28,22 +27,19 @@ class FileLock implements Lock
      * @param boolean         $exclusive         true for an exclusive lock, false for shared one
      * @param boolean         $blocking          true to wait for lock to be available,
      *                                           false to throw exception instead of waiting
-     * @param string|null     $identifier        resource identifier (default to $lock_file) for logging
      * @param boolean         $remove_on_release remove file on release if no other lock remains
      * @param LoggerInterface $logger
      */
     public function __construct(
         $lock_file,
         $exclusive = FileLock::EXCLUSIVE,
         $blocking = FileLock::NON_BLOCKING,
-        $identifier = null,
         $remove_on_release = false,
         LoggerInterface $logger = null
     ) {
         $this->lock_file         = $lock_file;
         $this->exclusive         = $exclusive;
         $this->blocking          = $blocking;
-        $this->identifier        = $identifier?:$lock_file;
         $this->remove_on_release = $remove_on_release;
 
         $this->logger = $logger ?: new NullLogger;
@@ -79,20 +75,20 @@ public function acquire()
     private function tryAcquire($operation, $lock_type)
     {
         $log_data = [
-            'identifier' => $this->identifier,
+            'lock_file' => $this->lock_file,
             'lock_type' => $lock_type
         ];
 
         if (!$this->flock($operation)) {
-            $this->logger->debug('could not acquire {lock_type} lock on {identifier}', $log_data);
+            $this->logger->debug('could not acquire {lock_type} lock on {lock_file}', $log_data);
 
             throw new Exception(
-                'Could not acquire '.$lock_type.' lock on '.$this->identifier
+                'Could not acquire '.$lock_type.' lock on '.$this->lock_file
             );
 
         }
 
-        $this->logger->debug('{lock_type} lock acquired on {identifier}', $log_data);
+        $this->logger->debug('{lock_type} lock acquired on {lock_file}', $log_data);
     }
 
     public function release()
@@ -109,7 +105,7 @@ public function release()
         fclose($this->fh);
         $this->fh = null;
 
-        $this->logger->debug('{lock_type} lock released on {identifier}', ['identifier' => $this->identifier]);
+        $this->logger->debug('{lock_type} lock released on {lock_file}', ['lock_file' => $this->lock_file]);
     }
 
     public function __destruct()