Fix locking.

horde · Jul 1, 2016 · 1d52447 · 1d52447
1 parent 7239977
commit 1d52447
Showing 1 changed file with 19 additions and 1 deletion.
diff --git a/framework/Memcache/lib/Horde/Memcache.php b/framework/Memcache/lib/Horde/Memcache.php
@@ -430,7 +430,7 @@ public function lock($key)
     {
         $i = 0;
 
-        while ($this->_memcache->add($this->_key($key . self::LOCK_SUFFIX), 1, self::LOCK_TIMEOUT) === false) {
+        while ($this->_lockAdd($key) === false) {
             usleep(min(pow(2, $i++) * 10000, 100000));
         }
 
@@ -455,6 +455,24 @@ public function lock($key)
         $this->_locks[$key] = true;
     }
 
+    /**
+     * Small wrapper around Memcache[d]#add().
+     *
+     * @param string $key  The key to lock.
+     */
+    protected function _lockAdd($key)
+    {
+        if ($this->_memcache instanceof Memcached) {
+            $this->_memcache->add(
+                $this->_key($key . self::LOCK_SUFFIX), 1, self::LOCK_TIMEOUT
+            );
+        } else {
+            $this->_memcache->add(
+                $this->_key($key . self::LOCK_SUFFIX), 1, 0, self::LOCK_TIMEOUT
+            );
+        }
+    }
+
     /**
      * Release lock on a key.
      *