V4.1.x (#40)

* optimization log * Compatible with docker in the same data volume * fixed: return bool bug
kcloze · Sep 30, 2019 · f68f75d · f68f75d
1 parent d4b4136
commit f68f75d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/src/Queue/RabbitmqTopicQueue.php b/src/Queue/RabbitmqTopicQueue.php
@@ -94,7 +94,7 @@ public function push($topic, JobObject $job, $delayStrategy=1, $serializeFunc='p
         }
 
         $queue        = $this->createQueue($topic);
-        if (!is_object($queue)) {
+        if (!\is_object($queue)) {
             //对象有误 则直接返回空
             return '';
         }
@@ -138,23 +138,23 @@ public function pop($topic, $unSerializeFunc='php')
         }
         //reset consumer and message properties
         $this->consumer=null;
-        $this->message=null;
+        $this->message =null;
 
         $queue    = $this->createQueue($topic);
         $consumer = $this->context->createConsumer($queue);
 
         if ($m = $consumer->receive(1)) {
             $result         =$m->getBody();
             $this->consumer =$consumer;
-            $this->message =$m;
+            $this->message  =$m;
             //判断字符串是否是php序列化的字符串，目前只允许serialzie和json两种
             $unSerializeFunc=Serialize::isSerial($result) ? 'php' : 'json';
 
             return !empty($result) ? Serialize::unserialize($result, $unSerializeFunc) : null;
         }
     }
 
-    public function ack(): boolean
+    public function ack(): bool
     {
         if ($this->consumer && $this->message) {
             $this->consumer->acknowledge($this->message);
@@ -174,7 +174,7 @@ public function len($topic): int
         }
 
         $queue = $this->createQueue($topic);
-        if (!is_object($queue)) {
+        if (!\is_object($queue)) {
             //对象有误 则直接返回空
             return -1;
         }

diff --git a/src/Queue/RedisTopicQueue.php b/src/Queue/RedisTopicQueue.php
@@ -86,7 +86,7 @@ public function pop($topic, $unSerializeFunc='php')
     }
 
     //redis不支持ack功能，搞个假的，没办法
-    public function ack(): boolean
+    public function ack(): bool
     {
         return true;
     }

diff --git a/src/Queue/TopicQueueInterface.php b/src/Queue/TopicQueueInterface.php
@@ -45,10 +45,10 @@ public function push($topic, JobObject $job): string;
      */
     public function pop($topic);
 
-    /** 
-     *  ack确认消息
-    */
-    public function ack(): boolean;
+    /**
+     *  ack确认消息.
+     */
+    public function ack(): bool;
 
     /**
      * @param $topic