Merge "Use quickUserCan instead of userCan for searches"

[lhc/web/wiklou.git] / includes / poolcounter / PoolCounterRedis.php

diff --git a/includes/poolcounter/PoolCounterRedis.php b/includes/poolcounter/PoolCounterRedis.php
index 1bc10f2..093fe49 100644 (file)
--- a/includes/poolcounter/PoolCounterRedis.php
+++ b/includes/poolcounter/PoolCounterRedis.php
@@ -45,7 +45,7 @@
  * Also this should be on a server plenty of RAM for the working set to avoid evictions.
  * Evictions could temporarily allow wait queues to double in size or temporarily cause
  * pools to appear as full when they are not. Using volatile-ttl and bumping memory-samples
- * and redis.conf can be helpful otherwise.
+ * in redis.conf can be helpful otherwise.
  *
  * @ingroup Redis
  * @since 1.23
@@ -59,24 +59,24 @@ class PoolCounterRedis extends PoolCounter {
        protected $serversByLabel;
        /** @var string SHA-1 of the key */
        protected $keySha1;
-       /** @var integer TTL for locks to expire (work should finish in this time) */
+       /** @var int TTL for locks to expire (work should finish in this time) */
        protected $lockTTL;
 
        /** @var RedisConnRef */
        protected $conn;
        /** @var string Pool slot value */
        protected $slot;
-       /** @var integer AWAKE_* constant */
+       /** @var int AWAKE_* constant */
        protected $onRelease;
        /** @var string Unique string to identify this process */
        protected $session;
-       /** @var integer UNIX timestamp */
+       /** @var int UNIX timestamp */
        protected $slotTime;
 
        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 array List of active PoolCounterRedis objects in this script */
        protected static $active = null;
 
        function __construct( $conf, $type, $key ) {
@@ -267,7 +267,7 @@ LUA;
 
        /**
         * @param RedisConnRef $conn
-        * @param float UNIX timestamp
+        * @param float $now UNIX timestamp
         * @return string|bool False on failure
         */
        protected function initAndPopPoolSlotList( RedisConnRef $conn, $now ) {
@@ -406,7 +406,8 @@ LUA;
                                if ( $poolCounter->slot !== null ) {
                                        $poolCounter->release();
                                }
-                       } catch ( Exception $e ) {}
+                       } catch ( Exception $e ) {
+                       }
                }
        }
 }