From 9fe7aaa12e69ddb3cf99ee5681adbc32aa65ad54 Mon Sep 17 00:00:00 2001 From: "xueli.xue" Date: Wed, 18 Aug 2021 21:45:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=BA=BF=E7=A8=8B=E5=90=8D?= =?UTF-8?q?=E4=BC=98=E5=8C=96(ISSUE-2527)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/XXL-JOB官方文档.md | 5 +++-- .../main/java/com/xxl/job/core/server/EmbedServer.java | 2 +- .../src/main/java/com/xxl/job/core/thread/JobThread.java | 3 +++ .../src/main/java/com/xxl/job/core/util/NetUtil.java | 2 +- .../java/com/xxl/job/core/util/XxlJobRemotingUtil.java | 8 ++++---- 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/doc/XXL-JOB官方文档.md b/doc/XXL-JOB官方文档.md index 162db67e..7077d996 100644 --- a/doc/XXL-JOB官方文档.md +++ b/doc/XXL-JOB官方文档.md @@ -2185,8 +2185,9 @@ public void execute() { - 重试任务：失败时，新增主任务。所有调度记录，包括入口调度和重试调度，均挂载主任务上。 - 2、【优化】[规划中]分片任务：全部完成后才会出发后置节点； - 3、【优化】多个项目依赖升级至较新稳定版本，如netty、groovy、spring、springboot等； -- 3、【优化】合并多项PR：代码结构、代码变量和注释等多项优化调整； -- 4、【修复】邮箱校验逻辑下放至EmailJobAlarm中，避免对其他告警方式的干扰； +- 4、【优化】合并多项PR：代码结构、代码变量和注释等多项优化调整； +- 5、【优化】任务线程名优化(ISSUE-2527) +- 6、【修复】邮箱校验逻辑下放至EmailJobAlarm中，避免对其他告警方式的干扰； ### 7.33 版本 v2.4.0 Release Notes[规划中] - 1、[规划中]DAG流程任务 diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/server/EmbedServer.java b/xxl-job-core/src/main/java/com/xxl/job/core/server/EmbedServer.java index a3fc9af9..242d6b63 100644 --- a/xxl-job-core/src/main/java/com/xxl/job/core/server/EmbedServer.java +++ b/xxl-job-core/src/main/java/com/xxl/job/core/server/EmbedServer.java @@ -52,7 +52,7 @@ public class EmbedServer { new ThreadFactory() { @Override public Thread newThread(Runnable r) { - return new Thread(r, "xxl-rpc, EmbedServer bizThreadPool-" + r.hashCode()); + return new Thread(r, "xxl-job, EmbedServer bizThreadPool-" + r.hashCode()); } }, new RejectedExecutionHandler() { diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/thread/JobThread.java b/xxl-job-core/src/main/java/com/xxl/job/core/thread/JobThread.java index 5c7553c1..cf07a55a 100644 --- a/xxl-job-core/src/main/java/com/xxl/job/core/thread/JobThread.java +++ b/xxl-job-core/src/main/java/com/xxl/job/core/thread/JobThread.java @@ -44,6 +44,9 @@ public class JobThread extends Thread{ this.handler = handler; this.triggerQueue = new LinkedBlockingQueue(); this.triggerLogIdSet = Collections.synchronizedSet(new HashSet()); + + // assign job thread name + this.setName("xxl-job, JobThread-"+jobId+"-"+System.currentTimeMillis()); } public IJobHandler getHandler() { return handler; diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/util/NetUtil.java b/xxl-job-core/src/main/java/com/xxl/job/core/util/NetUtil.java index 31270df1..41d285f1 100644 --- a/xxl-job-core/src/main/java/com/xxl/job/core/util/NetUtil.java +++ b/xxl-job-core/src/main/java/com/xxl/job/core/util/NetUtil.java @@ -53,7 +53,7 @@ public class NetUtil { serverSocket = new ServerSocket(port); used = false; } catch (IOException e) { - logger.info(">>>>>>>>>>> xxl-rpc, port[{}] is in use.", port); + logger.info(">>>>>>>>>>> xxl-job, port[{}] is in use.", port); used = true; } finally { if (serverSocket != null) { diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/util/XxlJobRemotingUtil.java b/xxl-job-core/src/main/java/com/xxl/job/core/util/XxlJobRemotingUtil.java index eac2dd00..d22a73e7 100644 --- a/xxl-job-core/src/main/java/com/xxl/job/core/util/XxlJobRemotingUtil.java +++ b/xxl-job-core/src/main/java/com/xxl/job/core/util/XxlJobRemotingUtil.java @@ -118,7 +118,7 @@ public class XxlJobRemotingUtil { // valid StatusCode int statusCode = connection.getResponseCode(); if (statusCode != 200) { - return new ReturnT(ReturnT.FAIL_CODE, "xxl-rpc remoting fail, StatusCode("+ statusCode +") invalid. for url : " + url); + return new ReturnT(ReturnT.FAIL_CODE, "xxl-job remoting fail, StatusCode("+ statusCode +") invalid. for url : " + url); } // result @@ -135,13 +135,13 @@ public class XxlJobRemotingUtil { ReturnT returnT = GsonTool.fromJson(resultJson, ReturnT.class, returnTargClassOfT); return returnT; } catch (Exception e) { - logger.error("xxl-rpc remoting (url="+url+") response content invalid("+ resultJson +").", e); - return new ReturnT(ReturnT.FAIL_CODE, "xxl-rpc remoting (url="+url+") response content invalid("+ resultJson +")."); + logger.error("xxl-job remoting (url="+url+") response content invalid("+ resultJson +").", e); + return new ReturnT(ReturnT.FAIL_CODE, "xxl-job remoting (url="+url+") response content invalid("+ resultJson +")."); } } catch (Exception e) { logger.error(e.getMessage(), e); - return new ReturnT(ReturnT.FAIL_CODE, "xxl-rpc remoting error("+ e.getMessage() +"), for url : " + url); + return new ReturnT(ReturnT.FAIL_CODE, "xxl-job remoting error("+ e.getMessage() +"), for url : " + url); } finally { try { if (bufferedReader != null) {