Merge pull request #2 from mathroc/fix/release

fix lock release on fatal error and SIGTERM

Author: mathroc

composer.json

@@ -16,6 +16,7 @@
         "phpunit/phpunit": "~4.0"
     },
     "require": {
+        "ext-pcntl": "*",
         "texthtml/php-lock": "~2.1",
         "predis/predis": "~1.0",
         "psr/log": "~1.0"

src/RedisSimpleLock.php

@@ -32,6 +32,8 @@ public function __construct($identifier, Client $client, $ttl = 10000, LoggerInt
         $this->ttl        = $ttl;
         $this->logger     = $logger ?: new NullLogger;
         $this->id         = mt_rand();
+        register_shutdown_function($closure = $this->releaseClosure());
+        pcntl_signal(SIGINT, $closure);
     }
 
     public function acquire()
@@ -48,18 +50,32 @@ public function acquire()
 
     public function release()
     {
-        $script = <<<LUA
-    if redis.call("get", KEYS[1]) == ARGV[1] then
-        return redis.call("del", KEYS[1])
-    end
-LUA;
-        if ($this->client->eval($script, 1, $this->identifier, $this->id)) {
-            $this->logger->debug("lock released on {identifier}", ["identifier" => $this->identifier]);
-        }
+        $closure = $this->releaseClosure();
+        $closure();
     }
 
     public function __destruct()
     {
         $this->release();
     }
+
+    private function releaseClosure()
+    {
+        $client = $this->client;
+        $id = $this->id;
+        $identifier = $this->identifier;
+        $logger = $this->logger;
+
+        $closure = function () use ($client, $identifier, $id, $logger) {
+            $script = <<<LUA
+    if redis.call("get", KEYS[1]) == ARGV[1] then
+        return redis.call("del", KEYS[1])
+    end
+LUA;
+            if ($client->eval($script, 1, $identifier, $id)) {
+                $logger->debug("lock released on {identifier}", ["identifier" => $identifier]);
+            }
+        };
+        return $closure->bindTo(null);
+    }
 }