6871: Fixed merge

tuj · tuj · commit 318e9c636484 · 2026-04-15T09:59:05.000+02:00
diff --git a/.env b/.env
@@ -61,6 +61,11 @@ REDIS_CACHE_PREFIX=DisplayApiService
 REDIS_CACHE_DSN=redis://redis:6379/0
 ###< redis ###
 
+###> Http Client ###
+HTTP_CLIENT_TIMEOUT=5
+HTTP_CLIENT_MAX_DURATION=30
+###< Http Client ###
+
 ###> App ###
 DEFAULT_DATE_FORMAT='Y-m-d\TH:i:s.v\Z'
 ACTIVATION_CODE_EXPIRE_INTERVAL=P2D
diff --git a/config/packages/framework.yaml b/config/packages/framework.yaml
@@ -14,6 +14,11 @@ framework:
         cookie_samesite: lax
         storage_factory_id: session.storage.factory.native
 
+    http_client:
+        default_options:
+            timeout: '%env(float:HTTP_CLIENT_TIMEOUT)%'
+            max_duration: '%env(float:HTTP_CLIENT_MAX_DURATION)%'
+
     #esi: true
     #fragments: true
     php_errors:
diff --git a/config/packages/prod/cache.yaml b/config/packages/prod/cache.yaml
@@ -0,0 +1,3 @@
+framework:
+    cache:
+        app: cache.adapter.redis
diff --git a/docs/v2-changelogs/api.md b/docs/v2-changelogs/api.md
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+- [#379](https://github.com/os2display/display-api-service/pull/379)
+  - Ensure the http client has a default time out setting. Make it configurable in env.
+- [#376](https://github.com/os2display/display-api-service/pull/376)
+  - Add prod override for cache.app to use Redis in production.
+
 ## [2.6.1] - 2026-03-10
 
 - [#347](https://github.com/os2display/display-api-service/pull/347)
diff --git a/infrastructure/itkdev/display-api-service/etc/confd/templates/env.local.tmpl b/infrastructure/itkdev/display-api-service/etc/confd/templates/env.local.tmpl
@@ -65,6 +65,11 @@ CALENDAR_API_FEED_SOURCE_CACHE_EXPIRE_SECONDS={{ getenv "APP_CALENDAR_API_FEED_S
 
 EVENTDATABASE_API_V2_CACHE_EXPIRE_SECONDS={{ getenv "APP_EVENTDATABASE_API_V2_CACHE_EXPIRE_SECONDS" "300" }}
 
+###> Http Client ###
+HTTP_CLIENT_TIMEOUT={{ getenv "APP_HTTP_CLIENT_TIMEOUT" "5" }}
+HTTP_CLIENT_MAX_DURATION={{ getenv "APP_HTTP_CLIENT_MAX_DURATION" "30" }}
+###< Http Client ###
+
 TRACK_SCREEN_INFO={{ getenv "APP_TRACK_SCREEN_INFO" "false" }}
 TRACK_SCREEN_INFO_UPDATE_INTERVAL_SECONDS={{ getenv "APP_TRACK_SCREEN_INFO_UPDATE_INTERVAL_SECONDS" "300" }}
 
diff --git a/infrastructure/os2display/display-api-service/etc/confd/templates/env.local.tmpl b/infrastructure/os2display/display-api-service/etc/confd/templates/env.local.tmpl
@@ -65,6 +65,11 @@ CALENDAR_API_FEED_SOURCE_CACHE_EXPIRE_SECONDS={{ getenv "CALENDAR_API_FEED_SOURC
 
 EVENTDATABASE_API_V2_CACHE_EXPIRE_SECONDS={{ getenv "APP_EVENTDATABASE_API_V2_CACHE_EXPIRE_SECONDS" "300" }}
 
+###> Http Client ###
+HTTP_CLIENT_TIMEOUT={{ getenv "APP_HTTP_CLIENT_TIMEOUT" "5" }}
+HTTP_CLIENT_MAX_DURATION={{ getenv "APP_HTTP_CLIENT_MAX_DURATION" "30" }}
+###< Http Client ###
+
 TRACK_SCREEN_INFO={{ getenv "APP_TRACK_SCREEN_INFO" "false" }}
 TRACK_SCREEN_INFO_UPDATE_INTERVAL_SECONDS={{ getenv "APP_TRACK_SCREEN_INFO_UPDATE_INTERVAL_SECONDS" "300" }}
 
diff --git a/src/Feed/EventDatabaseApiFeedType.php b/src/Feed/EventDatabaseApiFeedType.php
@@ -22,7 +22,6 @@
 class EventDatabaseApiFeedType implements FeedTypeInterface
 {
     final public const string SUPPORTED_FEED_TYPE = FeedOutputModels::POSTER_OUTPUT;
-    final public const int REQUEST_TIMEOUT = 10;
 
     public function __construct(
         private readonly FeedService $feedService,
@@ -72,7 +71,6 @@ public function getData(Feed $feed): array
                             'GET',
                             "$host/api/events",
                             [
-                                'timeout' => self::REQUEST_TIMEOUT,
                                 'query' => $queryParams,
                             ]
                         );
@@ -88,9 +86,6 @@ public function getData(Feed $feed): array
                             $response = $this->client->request(
                                 'GET',
                                 "$host$occurrenceId",
-                                [
-                                    'timeout' => self::REQUEST_TIMEOUT,
-                                ]
                             );
 
                             $content = $response->getContent();
@@ -200,9 +195,6 @@ public function getConfigOptions(Request $request, FeedSource $feedSource, strin
                 $response = $this->client->request(
                     'GET',
                     "$host$path",
-                    [
-                        'timeout' => self::REQUEST_TIMEOUT,
-                    ]
                 );
 
                 $content = $response->getContent();
@@ -247,7 +239,6 @@ public function getConfigOptions(Request $request, FeedSource $feedSource, strin
                     'GET',
                     "$host/api/$type",
                     [
-                        'timeout' => self::REQUEST_TIMEOUT,
                         'query' => $queryParams,
                     ]
                 );
diff --git a/src/Feed/EventDatabaseApiV2Helper.php b/src/Feed/EventDatabaseApiV2Helper.php
@@ -16,8 +16,6 @@
 
 class EventDatabaseApiV2Helper
 {
-    final public const int REQUEST_TIMEOUT = 10;
-
     public function __construct(
         private readonly HttpClientInterface $client,
     ) {}
@@ -34,7 +32,6 @@ public function request(FeedSource $feedSource, string $entityType, ?array $quer
         $apikey = $secrets['apikey'];
 
         $options = [
-            'timeout' => self::REQUEST_TIMEOUT,
             'headers' => [
                 'X-Api-Key' => $apikey,
             ],
diff --git a/src/Feed/NotifiedFeedType.php b/src/Feed/NotifiedFeedType.php
@@ -18,7 +18,6 @@
 class NotifiedFeedType implements FeedTypeInterface
 {
     final public const string SUPPORTED_FEED_TYPE = FeedOutputModels::INSTAGRAM_OUTPUT;
-    final public const int REQUEST_TIMEOUT = 10;
 
     private const string BASE_URL = 'https://api.listen.notified.com';
 
@@ -147,7 +146,6 @@ public function getMentions(string $token, int $page = 1, int $pageSize = 10, ar
             'POST',
             self::BASE_URL.'/api/listen/mentions',
             [
-                'timeout' => self::REQUEST_TIMEOUT,
                 'headers' => [
                     'Accept' => 'application/json',
                     'Content-Type' => 'application/json',
@@ -166,7 +164,6 @@ public function getSearchProfiles(string $token): array
             'GET',
             self::BASE_URL.'/api/listen/searchprofiles',
             [
-                'timeout' => self::REQUEST_TIMEOUT,
                 'headers' => [
                     'Accept' => 'application/json',
                     'Content-Type' => 'application/json',
diff --git a/src/Feed/SparkleIOFeedType.php b/src/Feed/SparkleIOFeedType.php
@@ -24,8 +24,6 @@ class SparkleIOFeedType implements FeedTypeInterface
 {
     final public const string SUPPORTED_FEED_TYPE = FeedOutputModels::INSTAGRAM_OUTPUT;
 
-    final public const int REQUEST_TIMEOUT = 10;
-
     public function __construct(
         private readonly FeedService $feedService,
         private readonly HttpClientInterface $client,
@@ -60,7 +58,6 @@ public function getData(Feed $feed): array
                 'GET',
                 $baseUrl.'v0.1/feed/'.$configuration['feeds'][0],
                 [
-                    'timeout' => self::REQUEST_TIMEOUT,
                     'headers' => [
                         'Authorization' => sprintf('Bearer %s', $token),
                     ],
@@ -130,7 +127,6 @@ public function getConfigOptions(Request $request, FeedSource $feedSource, strin
                     'GET',
                     $baseUrl.'v0.1/feed',
                     [
-                        'timeout' => self::REQUEST_TIMEOUT,
                         'headers' => [
                             'Authorization' => sprintf('Bearer %s', $token),
                         ],
@@ -222,7 +218,6 @@ private function getToken(string $baseUrl, string $clientId, string $clientSecre
                 'POST',
                 $baseUrl.'oauth/token',
                 [
-                    'timeout' => self::REQUEST_TIMEOUT,
                     'headers' => [
                         'Content-Type' => 'application/x-www-form-urlencoded',
                     ],

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+framework:`
	`2`	`+ cache:`
	`3`	`+ app: cache.adapter.redis`