Browse Source

chore: 修改超时时间

weijianghai 2 years ago
parent
commit
1b965c3123

+ 5 - 0
src/main/java/com/nokia/siteinfo/task/UpdateTask.java

@@ -25,6 +25,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 
 @ConfigurationProperties("task")
 @Data
@@ -61,6 +62,10 @@ public class UpdateTask {
             XxlJobHelper.log("线程中断: {}", e.getMessage(), e);
             Thread.currentThread().interrupt();
             throw new RuntimeException(e);
+        } catch (TimeoutException e) {
+            log.error("执行超时: {}", e.getMessage(), e);
+            XxlJobHelper.log("执行超时: {}", e.getMessage(), e);
+            XxlJobHelper.handleFail(e.getMessage());
         } catch (Exception e) {
             log.error("发生异常了: {}", e.getMessage(), e);
             XxlJobHelper.log("发生异常了: {}", e.getMessage(), e);

+ 1 - 1
src/main/resources/application-prod.properties

@@ -27,4 +27,4 @@ xxl.job.executor.logpath=./log/xxl/
 xxl.job.executor.logretentiondays=30
 
 task.gpload-shell-path=/data/site_info/gpload/gpload.sh
-task.timeout=5
+task.timeout=25

+ 1 - 1
src/main/resources/application-test.properties

@@ -27,4 +27,4 @@ xxl.job.executor.logpath=./log/xxl/
 xxl.job.executor.logretentiondays=30
 
 task.gpload-shell-path=/data1/site_info/gpload/gpload.sh
-task.timeout=5
+task.timeout=25