fix: 修复底层通讯超时设置无效的 Bug 并移除冗余参数

1. 修复 XxlJobExecutor 中 initAdminBizList 方法使用未校验的 timeout 参数导致超时设置无效的问题,改为使用成员变量 this.timeout。
2. 重构 initAdminBizList 方法签名,移除冗余的 timeout 参数。
close #3865
3.3.1-release
zhangyl 1 month ago
parent 166c28608c
commit 3a49fedde3

@ -76,7 +76,7 @@ public class XxlJobExecutor {
XxlJobFileAppender.initLogPath(logPath);
// init invoker, admin-client
initAdminBizList(adminAddresses, accessToken, timeout);
initAdminBizList(adminAddresses, accessToken);
// init JobLogFileCleanThread
@ -122,7 +122,7 @@ public class XxlJobExecutor {
// ---------------------- admin-client (rpc invoker) ----------------------
private static List<AdminBiz> adminBizList;
private void initAdminBizList(String adminAddresses, String accessToken, int timeout) throws Exception {
private void initAdminBizList(String adminAddresses, String accessToken) throws Exception {
if (StringTool.isNotBlank(adminAddresses)) {
for (String address: adminAddresses.trim().split(",")) {
if (StringTool.isNotBlank(address)) {
@ -137,7 +137,7 @@ public class XxlJobExecutor {
// build
AdminBiz adminBiz = HttpTool.createClient()
.url(finalAddress)
.timeout(timeout * 1000)
.timeout(this.timeout * 1000)
.header(Const.XXL_JOB_ACCESS_TOKEN, accessToken)
.proxy(AdminBiz.class);

Loading…
Cancel
Save