radelt: #665 add a http timeout to prevent DC hanging

noi-techpark · Sep 17, 2024 · 1f4f8ae · 1f4f8ae
1 parent ba20d4c
commit 1f4f8ae
Showing 1 changed file with 21 additions and 2 deletions.
diff --git a/data-collectors/radelt/src/main/java/com/opendatahub/bdp/radelt/RadeltAPIClient.java b/data-collectors/radelt/src/main/java/com/opendatahub/bdp/radelt/RadeltAPIClient.java
@@ -5,16 +5,22 @@
 package com.opendatahub.bdp.radelt;
 
 import java.net.URI;
+import java.util.Date;
 
 import org.apache.http.HttpEntity;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.utils.URIBuilder;
 import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.util.EntityUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Component;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -34,6 +40,21 @@ public enum Language {
     private final String BASE_URL_GER = "https://www.suedtirolradelt.bz.it";
     private final String PATH_CHALLENGES = "/dashboard/api/opendata/challenges";
     private final String PATH_ORGANIZATIONS = "/dashboard/api/opendata/organisations";
+
+
+    @Bean
+    public CloseableHttpClient httpClient(){
+        int timeout = 30 * 1000;
+        RequestConfig rc =  RequestConfig.custom()
+            .setConnectTimeout(timeout)
+            .setSocketTimeout(timeout)
+            .setConnectionRequestTimeout(timeout)
+            .build();
+        return HttpClientBuilder.create().setDefaultRequestConfig(rc).build();
+    }
+
+    @Autowired
+    CloseableHttpClient httpClient;
 
     public AktionenResponseDto fetchChallenges(String active, String type, Language lang)
             throws Exception {
@@ -47,7 +68,6 @@ public AktionenResponseDto fetchChallenges(String active, String type, Language
         uriBuilder.setParameter("type", type);
 
         URI uri = uriBuilder.build();
-        CloseableHttpClient httpClient = HttpClients.createDefault();
         HttpGet request = new HttpGet(uri);
 
         try (CloseableHttpResponse response = httpClient.execute(request)) {
@@ -82,7 +102,6 @@ public OrganisationenResponseDto fetchOrganizations(String challengeId, String t
         // uriBuilder.setParameter("offset", String.valueOf(offset));
 
         URI uri = uriBuilder.build();
-        CloseableHttpClient httpClient = HttpClients.createDefault();
         HttpGet request = new HttpGet(uri);
         LOG.info(uri.toString());