bug #47441 [HttpClient] [HttpClientBundle] Bugfix for delayed retryableHttpClient (martkop26)

nicolas-grekas · nicolas-grekas · commit f8d4168b7427 · 2022-09-08T11:24:57.000+02:00
This PR was submitted for the 6.2 branch but it was squashed and merged into the 5.4 branch instead. Discussion ---------- [HttpClient] [HttpClientBundle] Bugfix for delayed retryableHttpClient | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #47430 | License | MIT Commits ------- 87738ba [HttpClient] Fix computing retry delay when using RetryableHttpClient
diff --git a/src/Symfony/Component/HttpClient/RetryableHttpClient.php b/src/Symfony/Component/HttpClient/RetryableHttpClient.php
@@ -138,7 +138,7 @@ private function getDelayFromHeader(array $headers): ?int
     {
         if (null !== $after = $headers['retry-after'][0] ?? null) {
             if (is_numeric($after)) {
-                return (int) $after * 1000;
+                return (int) ($after * 1000);
             }
 
             if (false !== $time = strtotime($after)) {
diff --git a/src/Symfony/Component/HttpClient/Tests/RetryableHttpClientTest.php b/src/Symfony/Component/HttpClient/Tests/RetryableHttpClientTest.php
@@ -187,4 +187,42 @@ public function testCancelOnTimeout()
             $response->cancel();
         }
     }
+
+    public function testRetryWithDelay()
+    {
+        $retryAfter = '0.46';
+
+        $client = new RetryableHttpClient(
+            new MockHttpClient([
+                new MockResponse('', [
+                    'http_code' => 503,
+                    'response_headers' => [
+                        'retry-after' => $retryAfter,
+                    ],
+                ]),
+                new MockResponse('', [
+                    'http_code' => 200,
+                ]),
+            ]),
+            new GenericRetryStrategy(),
+            1,
+            $logger = new class() extends TestLogger {
+                public array $context = [];
+
+                public function log($level, $message, array $context = []): void
+                {
+                    $this->context = $context;
+                    parent::log($level, $message, $context);
+                }
+            },
+        );
+
+        $client->request('GET', 'http://example.com/foo-bar')->getContent();
+
+        $delay = $logger->context['delay'] ?? null;
+
+        $this->assertArrayHasKey('delay', $logger->context);
+        $this->assertNotNull($delay);
+        $this->assertSame((int) ($retryAfter * 1000), $delay);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ private function getDelayFromHeader(array $headers): ?int`
`138`	`138`	`{`
`139`	`139`	`if (null !== $after = $headers['retry-after'][0] ?? null) {`
`140`	`140`	`if (is_numeric($after)) {`
`141`		`- return (int) $after * 1000;`
	`141`	`+ return (int) ($after * 1000);`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`if (false !== $time = strtotime($after)) {`