修复一些问题

Author: Yurunsoft

src/Driver/RedisQueueDriver.php

@@ -155,7 +155,7 @@ public function push(IMessage $message, float $delay = 0, array $options = []):
         }
         if(false === $result)
         {
-            if('' === ($error = $redis->getLastError()))
+            if('' == ($error = $redis->getLastError()))
             {
                 throw new QueueException('Queue push failed');
             }
@@ -235,7 +235,7 @@ public function pop(float $timeout = -1): ?IMessage
             }
             if(false === $result)
             {
-                if('' === ($error = $redis->getLastError()))
+                if('' == ($error = $redis->getLastError()))
                 {
                     throw new QueueException('Queue pop failed');
                 }
@@ -282,7 +282,7 @@ public function delete(IMessage $message): bool
 
         if(false === $result)
         {
-            if('' === ($error = $redis->getLastError()))
+            if('' == ($error = $redis->getLastError()))
             {
                 throw new QueueException('Queue delete failed');
             }
@@ -345,7 +345,7 @@ public function success(IMessage $message)
 
         if(false === $result)
         {
-            if('' === ($error = $redis->getLastError()))
+            if('' == ($error = $redis->getLastError()))
             {
                 throw new QueueException('Queue success failed');
             }
@@ -395,7 +395,7 @@ public function fail(IMessage $message, bool $requeue = false)
 
         if(false === $result)
         {
-            if('' === ($error = $redis->getLastError()))
+            if('' == ($error = $redis->getLastError()))
             {
                 throw new QueueException('Queue success failed');
             }
@@ -460,7 +460,7 @@ public function restoreFailMessages(): int
 
         if(false === $result)
         {
-            if('' === ($error = $redis->getLastError()))
+            if('' == ($error = $redis->getLastError()))
             {
                 throw new QueueException('Queue restoreFailMessages failed');
             }
@@ -497,7 +497,7 @@ public function restoreTimeoutMessages(): int
 
         if(false === $result)
         {
-            if('' === ($error = $redis->getLastError()))
+            if('' == ($error = $redis->getLastError()))
             {
                 throw new QueueException('Queue restoreTimeoutMessages failed');
             }
@@ -542,7 +542,7 @@ protected function parseDelayMessages(int $count = 100): int
 
         if(false === $result)
         {
-            if('' === ($error = $redis->getLastError()))
+            if('' == ($error = $redis->getLastError()))
             {
                 throw new QueueException('Queue parseDelayMessages failed');
             }
@@ -572,9 +572,9 @@ protected function parseTimeoutMessages(int $count = 100)
 if 0 == messageIdCount then
     return 0
 end
--- 加入队列
+-- 加入超时队列
 redis.call('rpush', KEYS[2], unpack(messageIds))
--- 从延时队列删除
+-- 从工作队列删除
 redis.call('zrem', KEYS[1], unpack(messageIds))
 return messageIdCount
 LUA
@@ -587,7 +587,7 @@ protected function parseTimeoutMessages(int $count = 100)
 
         if(false === $result)
         {
-            if('' === ($error = $redis->getLastError()))
+            if('' == ($error = $redis->getLastError()))
             {
                 throw new QueueException('Queue parseTimeoutMessages failed');
             }

src/Service/QueueService.php

@@ -1,6 +1,7 @@
 <?php
 namespace Imi\Queue\Service;
 
+use Imi\App;
 use Imi\Bean\BeanFactory;
 use Imi\Bean\Annotation\Bean;
 use Imi\Queue\Model\QueueConfig;
@@ -113,7 +114,7 @@ public function getQueue(?string $name = null): IQueueDriver
         {
             return $queueInstances[$name];
         }
-        return $queueInstances[$name] = BeanFactory::newInstance($config->getDriver(), $name, $config->getConfig());
+        return $queueInstances[$name] = App::getBean($config->getDriver(), $name, $config->getConfig());
     }
 
 }