[amqp-interop] Fixes long sending of a message

makasim · makasim · commit d456b75628f2 · 2017-11-30T11:15:02.000+02:00
diff --git a/src/drivers/amqp_interop/Command.php b/src/drivers/amqp_interop/Command.php
@@ -30,12 +30,4 @@ public function actionListen()
     {
         $this->queue->listen();
     }
-
-    /**
-     * Creates all required queues, topics etc
-     */
-    public function actionSetupBroker()
-    {
-        $this->queue->setupBroker();
-    }
 }
diff --git a/src/drivers/amqp_interop/Queue.php b/src/drivers/amqp_interop/Queue.php
@@ -249,7 +249,6 @@ public function init()
     public function listen()
     {
         $this->open();
-        $this->setupBroker();
 
         $queue = $this->context->createQueue($this->queueName);
         $consumer = $this->context->createConsumer($queue);
@@ -295,7 +294,6 @@ public function getContext()
     protected function pushMessage($payload, $ttr, $delay, $priority)
     {
         $this->open();
-        $this->setupBroker();
 
         $topic = $this->context->createTopic($this->exchangeName);
 
@@ -393,9 +391,14 @@ protected function open()
         if ($this->context instanceof DelayStrategyAware) {
             $this->context->setDelayStrategy(new RabbitMqDlxDelayStrategy());
         }
+
+        $this->setupBroker();
     }
 
-    public function setupBroker()
+    /**
+     * Creates all required queues, topics etc
+     */
+    protected function setupBroker()
     {
         $queue = $this->context->createQueue($this->queueName);
         $queue->addFlag(AmqpQueue::FLAG_DURABLE);
diff --git a/tests/app/config/main.php b/tests/app/config/main.php
@@ -75,6 +75,8 @@
         ],
         'amqpInteropQueue' => [
             'class' => \yii\queue\amqp_interop\Queue::class,
+            'queueName' => 'queue-interop',
+            'exchangeName' => 'exchange-interop',
         ],
         'beanstalkQueue' => [
             'class' => \yii\queue\beanstalk\Queue::class,

Original file line number	Diff line number	Diff line change
`@@ -30,12 +30,4 @@ public function actionListen()`
`30`	`30`	`{`
`31`	`31`	`$this->queue->listen();`
`32`	`32`	`}`
`33`		`-`
`34`		`- /**`
`35`		`- * Creates all required queues, topics etc`
`36`		`- */`
`37`		`- public function actionSetupBroker()`
`38`		`- {`
`39`		`- $this->queue->setupBroker();`
`40`		`- }`
`41`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -249,7 +249,6 @@ public function init()`
`249`	`249`	`public function listen()`
`250`	`250`	`{`
`251`	`251`	`$this->open();`
`252`		`- $this->setupBroker();`
`253`	`252`
`254`	`253`	`$queue = $this->context->createQueue($this->queueName);`
`255`	`254`	`$consumer = $this->context->createConsumer($queue);`
`@@ -295,7 +294,6 @@ public function getContext()`
`295`	`294`	`protected function pushMessage($payload, $ttr, $delay, $priority)`
`296`	`295`	`{`
`297`	`296`	`$this->open();`
`298`		`- $this->setupBroker();`
`299`	`297`
`300`	`298`	`$topic = $this->context->createTopic($this->exchangeName);`
`301`	`299`
`@@ -393,9 +391,14 @@ protected function open()`
`393`	`391`	`if ($this->context instanceof DelayStrategyAware) {`
`394`	`392`	`$this->context->setDelayStrategy(new RabbitMqDlxDelayStrategy());`
`395`	`393`	`}`
	`394`	`+`
	`395`	`+ $this->setupBroker();`
`396`	`396`	`}`
`397`	`397`
`398`		`- public function setupBroker()`
	`398`	`+ /**`
	`399`	`+ * Creates all required queues, topics etc`
	`400`	`+ */`
	`401`	`+ protected function setupBroker()`
`399`	`402`	`{`
`400`	`403`	`$queue = $this->context->createQueue($this->queueName);`
`401`	`404`	`$queue->addFlag(AmqpQueue::FLAG_DURABLE);`