Moved HttpClient to be a class object.

madgik · Oct 9, 2020 · 7d151b7 · 7d151b7
1 parent 713ad78
commit 7d151b7
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/...adgik/exareme/master/gateway/async/handler/HBP/ConsulNodesPathologiesAndDatasetsInfo.java b/...adgik/exareme/master/gateway/async/handler/HBP/ConsulNodesPathologiesAndDatasetsInfo.java
@@ -25,6 +25,8 @@ public class ConsulNodesPathologiesAndDatasetsInfo {
     private final HashMap<String, String> nodeIPsToNames;
     private String masterNodeIP;
 
+    private static final CloseableHttpClient httpClient = HttpClients.createDefault();
+
     /**
      * Fetches the node information from CONSUL.
      *
@@ -185,33 +187,33 @@ private static String searchConsul(String query) throws ConsulException {
         log.debug("Consul Query: " + query);
 
         String consulURL = getConsulUrl();
-        if (!consulURL.startsWith("http://")) {
-            consulURL = "http://" + consulURL;
-        }
-
+        HttpGet request = new HttpGet(consulURL + "/v1/kv/" + query);
         try {
-            CloseableHttpClient httpclient = HttpClients.createDefault();
-
-            HttpGet httpGet = new HttpGet(consulURL + "/v1/kv/" + query);
-            CloseableHttpResponse response = httpclient.execute(httpGet);
+            CloseableHttpResponse response = httpClient.execute(request);
             if (response.getStatusLine().getStatusCode() != 200) {
                 log.error("Failed consul query: " + consulURL + "/v1/kv/" + query);
                 throw new ConsulException(
                         "There was an error contacting consul. StatusCode: " + response.getStatusLine().getStatusCode());
             }
-
             return EntityUtils.toString(response.getEntity());
 
         } catch (IOException e) {
             log.error("Failed consul query: " + consulURL + "/v1/kv/" + query);
             throw new ConsulException(
                     "An exception occurred while contacting Consul. Exception: " + e.getMessage());
+        } finally {
+            request.releaseConnection();
         }
     }
 
     private static String getConsulUrl() throws ConsulException {
         String consulURL = System.getenv("CONSULURL");
         if (consulURL == null) throw new ConsulException("CONSULURL environment variable is not set.");
+
+        if (!consulURL.startsWith("http://")) {
+            consulURL = "http://" + consulURL;
+        }
+
         return consulURL;
     }