From 07b69ee020e66b1d39e2a24ba69eddfa727357d4 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期二, 18 一月 2022 11:31:05 +0800
Subject: [PATCH] 优化任务队列满时任务拒绝策略
---
src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java | 11 ++++++-----
src/main/java/com/ruoyi/project/monitor/controller/SysJobController.java | 2 +-
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java b/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java
index 618a925..63739f9 100644
--- a/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java
+++ b/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java
@@ -1,13 +1,13 @@
package com.ruoyi.framework.config;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledThreadPoolExecutor;
-import java.util.concurrent.ThreadPoolExecutor;
+import com.ruoyi.common.utils.Threads;
import org.apache.commons.lang3.concurrent.BasicThreadFactory;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
-import com.ruoyi.common.utils.Threads;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.ThreadPoolExecutor;
/**
* 绾跨▼姹犻厤缃�
@@ -49,7 +49,8 @@
protected ScheduledExecutorService scheduledExecutorService()
{
return new ScheduledThreadPoolExecutor(corePoolSize,
- new BasicThreadFactory.Builder().namingPattern("schedule-pool-%d").daemon(true).build())
+ new BasicThreadFactory.Builder().namingPattern("schedule-pool-%d").daemon(true).build(),
+ new ThreadPoolExecutor.CallerRunsPolicy())
{
@Override
protected void afterExecute(Runnable r, Throwable t)
diff --git a/src/main/java/com/ruoyi/project/monitor/controller/SysJobController.java b/src/main/java/com/ruoyi/project/monitor/controller/SysJobController.java
index 50c08ca..ed22257 100644
--- a/src/main/java/com/ruoyi/project/monitor/controller/SysJobController.java
+++ b/src/main/java/com/ruoyi/project/monitor/controller/SysJobController.java
@@ -128,7 +128,7 @@
}
else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[] { Constants.LOOKUP_LDAP, Constants.LOOKUP_LDAPS }))
{
- return error("淇敼浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆涓嶅厑璁�'ldap'璋冪敤");
+ return error("淇敼浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆涓嶅厑璁�'ldap(s)'璋冪敤");
}
else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[] { Constants.HTTP, Constants.HTTPS }))
{
--
Gitblit v1.9.3