From 87738ba11894d740d76a157e723d34143f1c95ed Mon Sep 17 00:00:00 2001
From: martkop26 <112486711+martkop26@users.noreply.github.com>
Date: Tue, 30 Aug 2022 15:50:25 +0200
Subject: [PATCH] [HttpClient] Fix computing retry delay when using
RetryableHttpClient
---
.../HttpClient/RetryableHttpClient.php | 2 +-
.../Tests/RetryableHttpClientTest.php | 38 +++++++++++++++++++
2 files changed, 39 insertions(+), 1 deletion(-)
diff --git a/src/Symfony/Component/HttpClient/RetryableHttpClient.php b/src/Symfony/Component/HttpClient/RetryableHttpClient.php
index 4df466f4ceb31..9a5b503fa25fa 100644
--- 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
index 6bd9a1f15e788..21e63badb9caa 100644
--- 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);
+ }
}
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy