Pārlūkot izejas kodu

执行日志逻辑调整

xueli.xue 8 gadus atpakaļ
vecāks
revīzija
beb71a4939

+ 0 - 1
xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/jobinfo.index.ftl Parādīt failu

@@ -178,7 +178,6 @@ import com.xxl.job.core.biz.model.ReturnT;
178 178
 import com.xxl.job.core.handler.IJobHandler;
179 179
 
180 180
 public class DemoGlueJobHandler extends IJobHandler {
181
-	private static transient Logger logger = LoggerFactory.getLogger(DemoGlueJobHandler.class);
182 181
 
183 182
 	@Override
184 183
 	public ReturnT<String> execute(String... params) throws Exception {

+ 1 - 1
xxl-job-core/src/main/java/com/xxl/job/core/handler/impl/GlueJobHandler.java Parādīt failu

@@ -22,7 +22,7 @@ public class GlueJobHandler extends IJobHandler {
22 22
 
23 23
 	@Override
24 24
 	public ReturnT<String> execute(String... params) throws Exception {
25
-		XxlJobLogger.log("----------- glue.version:{} -----------" + glueUpdatetime);
25
+		XxlJobLogger.log("----------- glue.version:"+ glueUpdatetime +" -----------");
26 26
 		return jobHandler.execute(params);
27 27
 	}
28 28
 

+ 2 - 0
xxl-job-core/src/main/java/com/xxl/job/core/handler/impl/ScriptJobHandler.java Parādīt failu

@@ -5,6 +5,7 @@ import com.xxl.job.core.executor.XxlJobExecutor;
5 5
 import com.xxl.job.core.glue.GlueTypeEnum;
6 6
 import com.xxl.job.core.handler.IJobHandler;
7 7
 import com.xxl.job.core.log.XxlJobFileAppender;
8
+import com.xxl.job.core.log.XxlJobLogger;
8 9
 import com.xxl.job.core.util.ScriptUtil;
9 10
 
10 11
 /**
@@ -49,6 +50,7 @@ public class ScriptJobHandler extends IJobHandler {
49 50
         String logFileName = XxlJobExecutor.logPath.concat(XxlJobFileAppender.contextHolder.get());
50 51
 
51 52
         // invoke
53
+        XxlJobLogger.log("----------- script file:"+ scriptFileName +" -----------");
52 54
         int exitValue = ScriptUtil.execToFile(cmd, scriptFileName, logFileName, params);
53 55
         ReturnT<String> result = (exitValue==0)?ReturnT.SUCCESS:new ReturnT<String>(ReturnT.FAIL_CODE, "script exit value("+exitValue+") is failed");
54 56
         return result;

+ 7 - 8
xxl-job-core/src/main/java/com/xxl/job/core/thread/JobThread.java Parādīt failu

@@ -91,11 +91,13 @@ public class JobThread extends Thread{
91 91
 						if (toStop) {
92 92
 							XxlJobLogger.log("<br>----------- xxl-job toStop, stopReason:" + stopReason);
93 93
 						}
94
-						logger.error("JobThread Exception:", e);
95
-						StringWriter out = new StringWriter();
96
-						e.printStackTrace(new PrintWriter(out));
97 94
 
98
-						executeResult = new ReturnT<String>(ReturnT.FAIL_CODE, out.toString());
95
+						StringWriter stringWriter = new StringWriter();
96
+						e.printStackTrace(new PrintWriter(stringWriter));
97
+						String errorMsg = stringWriter.toString();
98
+						XxlJobLogger.log("JobThread Exception:" + errorMsg);
99
+
100
+						executeResult = new ReturnT<String>(ReturnT.FAIL_CODE, stringWriter.toString());
99 101
 					}
100 102
 
101 103
 					XxlJobLogger.log("----------- xxl-job job execute end ----------- <br> " +
@@ -117,10 +119,7 @@ public class JobThread extends Thread{
117 119
 				}
118 120
 
119 121
 				StringWriter stringWriter = new StringWriter();
120
-				PrintWriter printWriter = new PrintWriter(stringWriter, true);
121
-				e.printStackTrace(printWriter);
122
-				printWriter.flush();
123
-				stringWriter.flush();
122
+				e.printStackTrace(new PrintWriter(stringWriter));
124 123
 				String errorMsg = stringWriter.toString();
125 124
 				XxlJobLogger.log("----------- xxl-job JobThread Exception:" + errorMsg);
126 125
 			}