Merge "HTMLTitleTextField: Allow this field to not be required"

[lhc/web/wiklou.git] / includes / libs / lockmanager / RedisLockManager.php

diff --git a/includes/libs/lockmanager/RedisLockManager.php b/includes/libs/lockmanager/RedisLockManager.php
index a9f5ca3..ea9dde7 100644 (file)
--- a/includes/libs/lockmanager/RedisLockManager.php
+++ b/includes/libs/lockmanager/RedisLockManager.php
@@ -98,10 +98,11 @@ class RedisLockManager extends QuorumLockManager {
 
                try {
                        static $script =
+                       /** @lang Lua */
 <<<LUA
                        local failed = {}
                        -- Load input params (e.g. session, ttl, time of request)
-                       local rSession, rTTL, rTime = unpack(ARGV)
+                       local rSession, rTTL, rMaxTTL, rTime = unpack(ARGV)
                        -- Check that all the locks can be acquired
                        for i,requestKey in ipairs(KEYS) do
                                local _, _, rType, resourceKey = string.find(requestKey,"(%w+):(%w+)$")
@@ -132,7 +133,7 @@ class RedisLockManager extends QuorumLockManager {
                                        local _, _, rType, resourceKey = string.find(requestKey,"(%w+):(%w+)$")
                                        redis.call('hSet',resourceKey,rType .. ':' .. rSession,rTime + rTTL)
                                        -- In addition to invalidation logic, be sure to garbage collect
-                                       redis.call('expire',resourceKey,rTTL)
+                                       redis.call('expire',resourceKey,rMaxTTL)
                                end
                        end
                        return failed
@@ -143,7 +144,8 @@ LUA;
                                        [
                                                $this->session, // ARGV[1]
                                                $this->lockTTL, // ARGV[2]
-                                               time() // ARGV[3]
+                                               self::MAX_LOCK_TTL, // ARGV[3]
+                                               time() // ARGV[4]
                                        ]
                                ),
                                count( $pathsByKey ) # number of first argument(s) that are keys
@@ -191,6 +193,7 @@ LUA;
 
                try {
                        static $script =
+                       /** @lang Lua */
 <<<LUA
                        local failed = {}
                        -- Load input params (e.g. session)