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