diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor #34110 [Messenger] remove infinite (nullable) max retries (Tobion)

Browse Source 
This PR was merged into the 4.4 branch.

Discussion
----------

[Messenger] remove infinite (nullable) max retries

| Q             | A
| ------------- | ---
| Branch?       | 4.4
| Bug fix?      | no
| New feature?  | no <!-- please update src/**/CHANGELOG.md files -->
| Deprecations? | no <!-- please update UPGRADE-*.md and src/**/CHANGELOG.md files -->
| Tickets       | Fix #33284
| License       | MIT
| Doc PR        |

Infinite retries are useless and putting a high enough number is more self-explaining. Infinite retries could not be configured using the framework anyway, see issue.

Commits
-------

4a6ec8554e [Messenger] remove nullable max retries
This commit is contained in:
Tobias Schultze 2019-10-25 15:05:23 +02:00
commit 4d8a01e0f2
2 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Symfony/Component/Messenger/Retry/MultiplierRetryStrategy.php
View File

@ -38,12 +38,12 @@ class MultiplierRetryStrategy implements RetryStrategyInterface
private $maxDelayMilliseconds;
/**
* @param int $maxRetries The maximum number of time to retry (null means indefinitely)
* @param int $maxRetries The maximum number of times to retry
* @param int $delayMilliseconds Amount of time to delay (or the initial value when multiplier is used)
* @param float $multiplier Multiplier to apply to the delay each time a retry occurs
* @param int $maxDelayMilliseconds Maximum delay to allow (0 means no maximum)
*/
public function __construct(?int $maxRetries = 3, int $delayMilliseconds = 1000, float $multiplier = 1, int $maxDelayMilliseconds = 0)
public function __construct(int $maxRetries = 3, int $delayMilliseconds = 1000, float $multiplier = 1, int $maxDelayMilliseconds = 0)
{
$this->maxRetries = $maxRetries;
@ -65,10 +65,6 @@ class MultiplierRetryStrategy implements RetryStrategyInterface
public function isRetryable(Envelope $message): bool
{
if (null === $this->maxRetries) {
return true;
}
$retries = RedeliveryStamp::getRetryCountFromEnvelope($message);
return $retries < $this->maxRetries;

10
src/Symfony/Component/Messenger/Tests/Retry/MultiplierRetryStrategyTest.php
View File

@ -26,16 +26,6 @@ class MultiplierRetryStrategyTest extends TestCase
$this->assertTrue($strategy->isRetryable($envelope));
}
public function testIsRetryableWithNullMax()
{
$strategy = new MultiplierRetryStrategy(null);
$envelope = new Envelope(new \stdClass(), [new RedeliveryStamp(0, 'sender_alias')]);
$this->assertTrue($strategy->isRetryable($envelope));
$envelope = new Envelope(new \stdClass(), [new RedeliveryStamp(1, 'sender_alias')]);
$this->assertTrue($strategy->isRetryable($envelope));
}
public function testIsNotRetryable()
{
$strategy = new MultiplierRetryStrategy(3);