bugfix nginx collect http deadlock error (#1476)

Signed-off-by: tomsun28 <tomsun28@outlook.com>
apache · Jan 9, 2024 · e9913d7 · e9913d7
1 parent 0f90e90
commit e9913d7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/http/HttpCollectImpl.java b/collector/src/main/java/org/dromara/hertzbeat/collector/collect/http/HttpCollectImpl.java
@@ -112,9 +112,7 @@ public void collect(CollectRep.MetricsData.Builder builder,
         }
         HttpContext httpContext = createHttpContext(metrics.getHttp());
         HttpUriRequest request = createHttpRequest(metrics.getHttp());
-        try {
-            CloseableHttpResponse response = CommonHttpClient.getHttpClient()
-                                                     .execute(request, httpContext);
+        try (CloseableHttpResponse response = CommonHttpClient.getHttpClient().execute(request, httpContext)) {
             int statusCode = response.getStatusLine().getStatusCode();
             boolean isSuccessInvoke = checkSuccessInvoke(metrics, statusCode);
             log.debug("http response status: {}", statusCode);

diff --git a/collector/src/main/java/org/dromara/hertzbeat/collector/collect/nginx/NginxCollectImpl.java b/collector/src/main/java/org/dromara/hertzbeat/collector/collect/nginx/NginxCollectImpl.java
@@ -81,10 +81,8 @@ public void collect(CollectRep.MetricsData.Builder builder, long monitorId, Stri
 
         HttpContext httpContext = createHttpContext(metrics.getNginx());
         HttpUriRequest request = createHttpRequest(metrics.getNginx());
-        try {
+        try (CloseableHttpResponse response = CommonHttpClient.getHttpClient().execute(request, httpContext)){
             // 发起http请求，获取响应数据
-            CloseableHttpResponse response = CommonHttpClient.getHttpClient()
-                    .execute(request, httpContext);
             int statusCode = response.getStatusLine().getStatusCode();
             if (statusCode != SUCCESS_CODE) {
                 builder.setCode(CollectRep.Code.FAIL);
@@ -105,6 +103,10 @@ public void collect(CollectRep.MetricsData.Builder builder, long monitorId, Stri
             log.info(errorMsg);
             builder.setCode(CollectRep.Code.FAIL);
             builder.setMsg(errorMsg);
+        } finally {
+            if (request != null) {
+                request.abort();
+            }
         }
 
     }