From beb71a49392b0d2b1e8a1868728ffe738682c161 Mon Sep 17 00:00:00 2001
From: "xueli.xue" <xueli.xue@dianping.com>
Date: Fri, 28 Apr 2017 22:17:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=A7=E8=A1=8C=E6=97=A5=E5=BF=97=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/template/jobinfo/jobinfo.index.ftl    |  1 -
 .../xxl/job/core/handler/impl/GlueJobHandler.java |  2 +-
 .../job/core/handler/impl/ScriptJobHandler.java   |  2 ++
 .../java/com/xxl/job/core/thread/JobThread.java   | 15 +++++++--------
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/jobinfo.index.ftl b/xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/jobinfo.index.ftl
index 30afef0c..fd2e0e73 100644
--- a/xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/jobinfo.index.ftl
+++ b/xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/jobinfo.index.ftl
@@ -178,7 +178,6 @@ import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.IJobHandler;
 
 public class DemoGlueJobHandler extends IJobHandler {
-	private static transient Logger logger = LoggerFactory.getLogger(DemoGlueJobHandler.class);
 
 	@Override
 	public ReturnT<String> execute(String... params) throws Exception {
diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/handler/impl/GlueJobHandler.java b/xxl-job-core/src/main/java/com/xxl/job/core/handler/impl/GlueJobHandler.java
index a105e402..a0539fd8 100644
--- a/xxl-job-core/src/main/java/com/xxl/job/core/handler/impl/GlueJobHandler.java
+++ b/xxl-job-core/src/main/java/com/xxl/job/core/handler/impl/GlueJobHandler.java
@@ -22,7 +22,7 @@ public class GlueJobHandler extends IJobHandler {
 
 	@Override
 	public ReturnT<String> execute(String... params) throws Exception {
-		XxlJobLogger.log("----------- glue.version:{} -----------" + glueUpdatetime);
+		XxlJobLogger.log("----------- glue.version:"+ glueUpdatetime +" -----------");
 		return jobHandler.execute(params);
 	}
 
diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/handler/impl/ScriptJobHandler.java b/xxl-job-core/src/main/java/com/xxl/job/core/handler/impl/ScriptJobHandler.java
index f0cfa168..362e3c05 100644
--- a/xxl-job-core/src/main/java/com/xxl/job/core/handler/impl/ScriptJobHandler.java
+++ b/xxl-job-core/src/main/java/com/xxl/job/core/handler/impl/ScriptJobHandler.java
@@ -5,6 +5,7 @@ import com.xxl.job.core.executor.XxlJobExecutor;
 import com.xxl.job.core.glue.GlueTypeEnum;
 import com.xxl.job.core.handler.IJobHandler;
 import com.xxl.job.core.log.XxlJobFileAppender;
+import com.xxl.job.core.log.XxlJobLogger;
 import com.xxl.job.core.util.ScriptUtil;
 
 /**
@@ -49,6 +50,7 @@ public class ScriptJobHandler extends IJobHandler {
         String logFileName = XxlJobExecutor.logPath.concat(XxlJobFileAppender.contextHolder.get());
 
         // invoke
+        XxlJobLogger.log("----------- script file:"+ scriptFileName +" -----------");
         int exitValue = ScriptUtil.execToFile(cmd, scriptFileName, logFileName, params);
         ReturnT<String> result = (exitValue==0)?ReturnT.SUCCESS:new ReturnT<String>(ReturnT.FAIL_CODE, "script exit value("+exitValue+") is failed");
         return result;
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 2c84364a..2fc4d3d0 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
@@ -91,11 +91,13 @@ public class JobThread extends Thread{
 						if (toStop) {
 							XxlJobLogger.log("<br>----------- xxl-job toStop, stopReason:" + stopReason);
 						}
-						logger.error("JobThread Exception:", e);
-						StringWriter out = new StringWriter();
-						e.printStackTrace(new PrintWriter(out));
 
-						executeResult = new ReturnT<String>(ReturnT.FAIL_CODE, out.toString());
+						StringWriter stringWriter = new StringWriter();
+						e.printStackTrace(new PrintWriter(stringWriter));
+						String errorMsg = stringWriter.toString();
+						XxlJobLogger.log("JobThread Exception:" + errorMsg);
+
+						executeResult = new ReturnT<String>(ReturnT.FAIL_CODE, stringWriter.toString());
 					}
 
 					XxlJobLogger.log("----------- xxl-job job execute end ----------- <br> " +
@@ -117,10 +119,7 @@ public class JobThread extends Thread{
 				}
 
 				StringWriter stringWriter = new StringWriter();
-				PrintWriter printWriter = new PrintWriter(stringWriter, true);
-				e.printStackTrace(printWriter);
-				printWriter.flush();
-				stringWriter.flush();
+				e.printStackTrace(new PrintWriter(stringWriter));
 				String errorMsg = stringWriter.toString();
 				XxlJobLogger.log("----------- xxl-job JobThread Exception:" + errorMsg);
 			}