Browse Source

取消超时

wangyunpeng 1 day ago
parent
commit
efab4816e1

+ 1 - 4
core/src/main/java/com/tzld/videoVector/job/ChannelDemandMatchJob.java

@@ -249,10 +249,7 @@ public class ChannelDemandMatchJob {
         }
         }
         executor.shutdown();
         executor.shutdown();
         try {
         try {
-            if (!executor.awaitTermination(120, TimeUnit.MINUTES)) {
-                log.error("渠道 {} 匹配任务超时,强制终止", channelName);
-                executor.shutdownNow();
-            }
+            executor.awaitTermination(Long.MAX_VALUE, TimeUnit.MILLISECONDS);
         } catch (InterruptedException e) {
         } catch (InterruptedException e) {
             log.error("渠道 {} 匹配任务被中断", channelName);
             log.error("渠道 {} 匹配任务被中断", channelName);
             executor.shutdownNow();
             executor.shutdownNow();