From c2b0f358430c464c254cab8d0a0b59cf0eaecdbf Mon Sep 17 00:00:00 2001 From: Diego Luces Date: Tue, 28 Aug 2018 14:35:12 -0600 Subject: [PATCH 1/4] Fix RetryMiddleware::exponentialDelay by making it return milliseconds RetryMiddleware::exponentialDelay was being used as-is to set the delay option in the retry middleware. However, the option requires milliseconds and this method was returning seconds. --- tests/RetryMiddlewareTest.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/RetryMiddlewareTest.php b/tests/RetryMiddlewareTest.php index 7297aeb9f..ed23c32ae 100644 --- a/tests/RetryMiddlewareTest.php +++ b/tests/RetryMiddlewareTest.php @@ -73,9 +73,9 @@ public function testCanRetryExceptions() public function testBackoffCalculateDelay() { self::assertSame(0, RetryMiddleware::exponentialDelay(0)); - self::assertSame(1, RetryMiddleware::exponentialDelay(1)); - self::assertSame(2, RetryMiddleware::exponentialDelay(2)); - self::assertSame(4, RetryMiddleware::exponentialDelay(3)); - self::assertSame(8, RetryMiddleware::exponentialDelay(4)); + self::assertSame(1000, RetryMiddleware::exponentialDelay(1)); + self::assertSame(2000, RetryMiddleware::exponentialDelay(2)); + self::assertSame(4000, RetryMiddleware::exponentialDelay(3)); + self::assertSame(8000, RetryMiddleware::exponentialDelay(4)); } } From de9c8bd40fbe3eb5f8f6a364c22aef0a3fe396ce Mon Sep 17 00:00:00 2001 From: Diego Luces Date: Tue, 28 Aug 2018 14:36:56 -0600 Subject: [PATCH 2/4] Fix RetryMiddleware::exponentialDelay by making it return milliseconds RetryMiddleware::exponentialDelay was being used as-is to set the delay option in the retry middleware. However, the option requires milliseconds and this method was returning seconds. --- src/RetryMiddleware.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/RetryMiddleware.php b/src/RetryMiddleware.php index c8d72c200..15caf155c 100644 --- a/src/RetryMiddleware.php +++ b/src/RetryMiddleware.php @@ -51,7 +51,7 @@ public function __construct( */ public static function exponentialDelay($retries) { - return (int) pow(2, $retries - 1); + return (int) (pow(2, $retries - 1) * 1000); } /** From cbf6130c753fd78ae8ef01b3855e63adc88409a7 Mon Sep 17 00:00:00 2001 From: Diego Luces Date: Wed, 29 Aug 2018 12:06:39 -0600 Subject: [PATCH 3/4] Fix exponentialDelay int casting --- src/RetryMiddleware.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/RetryMiddleware.php b/src/RetryMiddleware.php index 15caf155c..75a8574aa 100644 --- a/src/RetryMiddleware.php +++ b/src/RetryMiddleware.php @@ -51,7 +51,7 @@ public function __construct( */ public static function exponentialDelay($retries) { - return (int) (pow(2, $retries - 1) * 1000); + return (int) pow(2, $retries - 1) * 1000; } /** From 04851a2d81ee11e3006e3da649d3b6d0f81bbb16 Mon Sep 17 00:00:00 2001 From: Nyholm Date: Sat, 7 Dec 2019 09:12:53 +0100 Subject: [PATCH 4/4] Added comment --- src/RetryMiddleware.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/RetryMiddleware.php b/src/RetryMiddleware.php index 75a8574aa..5acc8c5c3 100644 --- a/src/RetryMiddleware.php +++ b/src/RetryMiddleware.php @@ -47,7 +47,7 @@ public function __construct( * * @param int $retries * - * @return int + * @return int milliseconds. */ public static function exponentialDelay($retries) {