fixed #18

workbunny · Feb 4, 2024 · 4cac330 · 4cac330
1 parent 3540aaa
commit 4cac330
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/HookServer.php b/src/HookServer.php
@@ -45,6 +45,9 @@ class HookServer implements ServerInterface
     /** @var int|null pending处理定时器 */
     protected ?int $_claimTimer = null;
 
+    /** @var array 队列分组下次claim的游标 */
+    protected array $claimStartTags = [];
+
     /** @inheritDoc */
     public static function getConfig(string $key, $default = null)
     {
@@ -167,13 +170,10 @@ public function claim(string $queue, string $group, string $consumer)
             if ($idArray = self::getStorage()->xAutoClaim(
                 $queue, $group, $consumer,
                 self::getConfig('pending_timeout', 60 * 60) * 1000,
-                '0-0', -1, true
+                $this->claimStartTags[$queue][$group][$consumer] ?? '0-0', -1, true
             )) {
-                foreach ($idArray as $k => $v) {
-                    if (!$v or $v === '0-0') {
-                        unset($idArray[$k]);
-                    }
-                }
+                $this->claimStartTags[$queue][$group][$consumer] = $idArray[0] ?? '0-0';
+                $idArray = $idArray[2] ?? [];
                 if ($idArray) {
                     if (self::getStorage()->xAck($queue, $group, $idArray)) {
                         self::getStorage()->xDel($queue, $idArray);