修复部分场景下出现的“Timeout of 3 seconds exceeded.”错误问题

imiphp · Jul 21, 2020 · 07f2d18 · 07f2d18
1 parent 1682be1
commit 07f2d18
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/RateLimiter.php b/src/RateLimiter.php
@@ -72,7 +72,7 @@ public static function limitBlock($name, $capacity, $callback = null, $blockingT
         {
             $fill = $capacity;
         }
-        $storage = new ImiRedisStorage($name, RedisManager::getInstance($poolName));
+        $storage = new ImiRedisStorage($name, RedisManager::getInstance($poolName), $blockingTimeout);
         $rate    = new Rate($fill, $unit);
         $bucket  = new TokenBucket($capacity, $rate, $storage);
         $bucket->bootstrap($capacity);

diff --git a/src/Storage/ImiRedisStorage.php b/src/Storage/ImiRedisStorage.php
@@ -36,12 +36,13 @@ final class ImiRedisStorage implements Storage, GlobalScope
      *
      * @param string $name  The resource name.
      * @param \Imi\Redis\RedisHandler  $redis The Redis API.
+     * @param int $timeout
      */
-    public function __construct($name, \Imi\Redis\RedisHandler $redis)
+    public function __construct($name, \Imi\Redis\RedisHandler $redis, int $timeout = 3)
     {
         $this->key   = $name;
         $this->redis = $redis;
-        $this->mutex = new PHPRedisMutex([$redis], $name);
+        $this->mutex = new PHPRedisMutex([$redis], $name, $timeout);
     }
 
     public function bootstrap($microtime)