bug #33298 [Messenger] Stop worker when it should stop (tienvx)

fabpot · fabpot · commit 113fa0bc507f · 2019-08-26T17:58:46.000+02:00
This PR was merged into the 4.3 branch. Discussion ---------- [Messenger] Stop worker when it should stop | Q | A | ------------- | --- | Branch? | 4.3  | Bug fix? | yes | New feature? | no  | BC breaks? | no  | Deprecations? | no  | Tests pass? | yes  | Fixed tickets | NA  | License | MIT | Doc PR | NA   There are 2 things about this PR: * This PR fix the bug when using `limit`, `memory-limit`, `time-limit` options with command `messenger:consume`, these options does not work if the receiver return multiple messages * This PR is the continue work of #32783 Commits ------- 5c1f3a2 [Messenger] Stop worker when it should stop
diff --git a/src/Symfony/Component/Messenger/Tests/WorkerTest.php b/src/Symfony/Component/Messenger/Tests/WorkerTest.php
@@ -27,6 +27,7 @@
 use Symfony\Component\Messenger\Tests\Fixtures\DummyMessage;
 use Symfony\Component\Messenger\Transport\Receiver\ReceiverInterface;
 use Symfony\Component\Messenger\Worker;
+use Symfony\Component\Messenger\Worker\StopWhenMessageCountIsExceededWorker;
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 
 /**
@@ -361,6 +362,30 @@ public function testWorkerWithMultipleReceivers()
         // make sure they were processed in the correct order
         $this->assertSame([$envelope1, $envelope2, $envelope3, $envelope4, $envelope5, $envelope6], $processedEnvelopes);
     }
+
+    public function testWorkerWithDecorator()
+    {
+        $envelope1 = new Envelope(new DummyMessage('message1'));
+        $envelope2 = new Envelope(new DummyMessage('message2'));
+        $envelope3 = new Envelope(new DummyMessage('message3'));
+
+        $receiver = new DummyReceiver([
+            [$envelope1, $envelope2, $envelope3],
+        ]);
+
+        $bus = $this->getMockBuilder(MessageBusInterface::class)->getMock();
+
+        $worker = new Worker([$receiver], $bus);
+        $workerWithDecorator = new StopWhenMessageCountIsExceededWorker($worker, 2);
+        $processedEnvelopes = [];
+        $workerWithDecorator->run([], function (?Envelope $envelope) use ($worker, &$processedEnvelopes) {
+            if (null !== $envelope) {
+                $processedEnvelopes[] = $envelope;
+            }
+        });
+
+        $this->assertSame([$envelope1, $envelope2], $processedEnvelopes);
+    }
 }
 
 class DummyReceiver implements ReceiverInterface
diff --git a/src/Symfony/Component/Messenger/Worker.php b/src/Symfony/Component/Messenger/Worker.php
@@ -92,6 +92,10 @@ public function run(array $options = [], callable $onHandledCallback = null): vo
 
                     $this->handleMessage($envelope, $receiver, $transportName, $this->retryStrategies[$transportName] ?? null);
                     $onHandled($envelope);
+
+                    if ($this->shouldStop) {
+                        break 2;
+                    }
                 }
 
                 // after handling a single receiver, quit and start the loop again

Original file line number	Diff line number	Diff line change
`@@ -92,6 +92,10 @@ public function run(array $options = [], callable $onHandledCallback = null): vo`
`92`	`92`
`93`	`93`	`$this->handleMessage($envelope, $receiver, $transportName, $this->retryStrategies[$transportName] ?? null);`
`94`	`94`	`$onHandled($envelope);`
	`95`	`+`
	`96`	`+ if ($this->shouldStop) {`
	`97`	`+ break 2;`
	`98`	`+ }`
`95`	`99`	`}`
`96`	`100`
`97`	`101`	`// after handling a single receiver, quit and start the loop again`