From 4b450bb86f4d1723af339238476c10cc15f9341a Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Wed, 30 Jun 2021 10:37:12 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=A3=80=E6=B5=8Bkettle=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/dataset/ExtractDataService.java   | 29 +++++++++++++------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
index 9709de5e8a..49e36b37a8 100644
--- a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
@@ -12,6 +12,7 @@ import io.dataease.commons.constants.ScheduleType;
 import io.dataease.commons.constants.UpdateType;
 import io.dataease.commons.utils.CommonBeanFactory;
 import io.dataease.commons.utils.DorisTableUtils;
+import io.dataease.commons.utils.HttpClientUtil;
 import io.dataease.commons.utils.LogUtil;
 import io.dataease.datasource.constants.DatasourceTypes;
 import io.dataease.datasource.dto.DorisConfigration;
@@ -66,6 +67,7 @@ import org.pentaho.di.trans.steps.userdefinedjavaclass.UserDefinedJavaClassDef;
 import org.pentaho.di.trans.steps.userdefinedjavaclass.UserDefinedJavaClassMeta;
 import org.pentaho.di.www.SlaveServerJobStatus;
 import org.quartz.JobExecutionContext;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
@@ -835,16 +837,19 @@ public class ExtractDataService {
     }
 
     public boolean isKettleRunning() {
+       try {
+           if (!InetAddress.getByName(carte).isReachable(1000)) {
+               return false;
+           }
+       }catch (Exception e){
+           return false;
+       }
+        HttpGet getMethod = new HttpGet("http://" + carte + ":" + port);
+        HttpClientManager.HttpClientBuilderFacade clientBuilder = HttpClientManager.getInstance().createBuilder();
+        clientBuilder.setConnectionTimeout(1);
+        clientBuilder.setCredentials(user, passwd);
+        CloseableHttpClient httpClient = clientBuilder.build();
         try {
-            if (!InetAddress.getByName(carte).isReachable(1000)) {
-                return false;
-            }
-            CloseableHttpClient httpClient;
-            HttpGet getMethod = new HttpGet("http://" + carte + ":" + port);
-            HttpClientManager.HttpClientBuilderFacade clientBuilder = HttpClientManager.getInstance().createBuilder();
-            clientBuilder.setConnectionTimeout(1);
-            clientBuilder.setCredentials(user, passwd);
-            httpClient = clientBuilder.build();
             HttpResponse httpResponse = httpClient.execute(getMethod);
             int statusCode = httpResponse.getStatusLine().getStatusCode();
             if (statusCode != -1 && statusCode < 400) {
@@ -854,6 +859,12 @@ public class ExtractDataService {
             }
         } catch (Exception e) {
             return false;
+        }finally {
+            try {
+                httpClient.close();
+            } catch (Exception e) {
+                LoggerFactory.getLogger(HttpClientUtil.class).error("HttpClient关闭连接失败", e);
+            }
         }
     }