diff options
author | Pierre Schmitz <pierre@archlinux.de> | 2015-12-17 09:15:42 +0100 |
---|---|---|
committer | Pierre Schmitz <pierre@archlinux.de> | 2015-12-17 09:44:51 +0100 |
commit | a1789ddde42033f1b05cc4929491214ee6e79383 (patch) | |
tree | 63615735c4ddffaaabf2428946bb26f90899f7bf /includes/poolcounter/PoolCounterRedis.php | |
parent | 9e06a62f265e3a2aaabecc598d4bc617e06fa32d (diff) |
Update to MediaWiki 1.26.0
Diffstat (limited to 'includes/poolcounter/PoolCounterRedis.php')
-rw-r--r-- | includes/poolcounter/PoolCounterRedis.php | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/includes/poolcounter/PoolCounterRedis.php b/includes/poolcounter/PoolCounterRedis.php index 98797a30..d7357cfe 100644 --- a/includes/poolcounter/PoolCounterRedis.php +++ b/includes/poolcounter/PoolCounterRedis.php @@ -76,7 +76,7 @@ class PoolCounterRedis extends PoolCounter { const AWAKE_ONE = 1; // wake-up if when a slot can be taken from an existing process const AWAKE_ALL = 2; // wake-up if an existing process finishes and wake up such others - /** @var array List of active PoolCounterRedis objects in this script */ + /** @var PoolCounterRedis[] List of active PoolCounterRedis objects in this script */ protected static $active = null; function __construct( $conf, $type, $key ) { @@ -121,7 +121,6 @@ class PoolCounterRedis extends PoolCounter { } function acquireForMe() { - $status = $this->precheckAcquire(); if ( !$status->isGood() ) { return $status; @@ -131,7 +130,6 @@ class PoolCounterRedis extends PoolCounter { } function acquireForAnyone() { - $status = $this->precheckAcquire(); if ( !$status->isGood() ) { return $status; @@ -141,7 +139,6 @@ class PoolCounterRedis extends PoolCounter { } function release() { - if ( $this->slot === null ) { return Status::newGood( PoolCounter::NOT_LOCKED ); // not locked } @@ -190,7 +187,7 @@ class PoolCounterRedis extends PoolCounter { return 1 LUA; try { - $res = $conn->luaEval( $script, + $conn->luaEval( $script, array( $this->getSlotListKey(), $this->getSlotRTimeSetKey(), |