Merge pull request #1 from freyo/master

job queue name fixes

Author: freyo

config/cmq.php

@@ -12,6 +12,8 @@
     'secret_key' => env('CMQ_SECRET_KEY', 'your-secret-key'),
     'secret_id'  => env('CMQ_SECRET_ID', 'your-secret-id'),
 
+    'queue' => env('CMQ_QUEUE', 'default'),
+
     'options' => [
         'queue' => [
             'host' => env('CMQ_QUEUE_HOST', 'https://cmq-queue-region.api.qcloud.com'),

src/Queue/CMQQueue.php

@@ -50,7 +50,7 @@ public function size($queue = null)
     {
         $attributes = $this->getQueue($queue)->get_attributes();
 
-        return (int)$attributes->activeMsgNum;
+        return (int) $attributes->activeMsgNum;
     }
 
     /**
@@ -125,15 +125,16 @@ public function later($delay, $job, $data = '', $queue = null)
     public function pop($queue = null)
     {
         try {
-            $message = $this->getQueue($queue)->receive_message($this->queueOptions['polling_wait_seconds']);
+            $queue   = $this->getQueue($queue);
+            $message = $queue->receive_message($this->queueOptions['polling_wait_seconds']);
         } catch (CMQServerException $e) {
             if ($e->getCode() == self::CMQ_QUEUE_NO_MESSAGE_CODE) { //ignore no message
                 return null;
             }
             throw $e;
         }
 
-        return new CMQJob($this->container, $this, $message);
+        return new CMQJob($this->container, $this, $message, $queue);
     }
 
     /**

src/Queue/Driver/Queue.php

@@ -15,6 +15,14 @@ public function __construct($queue_name, CMQClient $cmq_client, $encoding = fals
         $this->encoding   = $encoding;
     }
 
+    /**
+     * @return mixed
+     */
+    public function getQueueName()
+    {
+        return $this->queue_name;
+    }
+
     /* 设置是否对消息体进行base64编码
 
         @type encoding: bool

src/Queue/Jobs/CMQJob.php

@@ -4,6 +4,7 @@
 
 use Freyo\LaravelQueueCMQ\Queue\CMQQueue;
 use Freyo\LaravelQueueCMQ\Queue\Driver\Message;
+use Freyo\LaravelQueueCMQ\Queue\Driver\Queue;
 use Illuminate\Container\Container;
 use Illuminate\Contracts\Queue\Job as JobContract;
 use Illuminate\Database\DetectsDeadlocks;
@@ -16,11 +17,12 @@ class CMQJob extends Job implements JobContract
     protected $connection;
     protected $message;
 
-    public function __construct(Container $container, CMQQueue $connection, Message $message)
+    public function __construct(Container $container, CMQQueue $connection, Message $message, Queue $queue)
     {
         $this->container  = $container;
         $this->connection = $connection;
         $this->message    = $message;
+        $this->queue      = $queue->getQueueName();
     }
 
     /**
@@ -62,7 +64,7 @@ public function delete()
     {
         parent::delete();
 
-        $this->connection->getQueue()->delete_message($this->message->receiptHandle);
+        $this->connection->getQueue($this->getQueue())->delete_message($this->message->receiptHandle);
     }
 
     /**