From 466b4e868af431be4629def9e559516318b66a55 Mon Sep 17 00:00:00 2001
From: "xueli.xue" <xueli.xue@dianping.com>
Date: Fri, 28 Apr 2017 21:51:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=97=A5=E5=BF=97=E5=8F=96?=
 =?UTF-8?q?=E5=87=BAslf4j=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../template/jobinfo/jobinfo.index.ftl        |  6 +--
 .../com/xxl/job/core/handler/IJobHandler.java | 15 -------
 .../job/core/handler/impl/GlueJobHandler.java |  6 +--
 .../com/xxl/job/core/log/XxlJobLogger.java    | 43 +++++++++++++++++++
 .../com/xxl/job/core/thread/JobThread.java    | 21 ++++++---
 .../service/jobhandler/DemoJobHandler.java    |  9 ++--
 6 files changed, 66 insertions(+), 34 deletions(-)
 create mode 100644 xxl-job-core/src/main/java/com/xxl/job/core/log/XxlJobLogger.java

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 c85bbcc5..30afef0c 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
@@ -173,9 +173,7 @@
 <textarea class="glueSource_java" style="display:none;" >
 package com.xxl.job.service.handler;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
+import com.xxl.job.core.log.XxlJobLogger;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.IJobHandler;
 
@@ -184,7 +182,7 @@ public class DemoGlueJobHandler extends IJobHandler {
 
 	@Override
 	public ReturnT<String> execute(String... params) throws Exception {
-		logger.info("XXL-JOB, Hello World.");
+		XxlJobLogger.log("XXL-JOB, Hello World.");
 		return ReturnT.SUCCESS;
 	}
 
diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/handler/IJobHandler.java b/xxl-job-core/src/main/java/com/xxl/job/core/handler/IJobHandler.java
index 3a021889..246068ef 100644
--- a/xxl-job-core/src/main/java/com/xxl/job/core/handler/IJobHandler.java
+++ b/xxl-job-core/src/main/java/com/xxl/job/core/handler/IJobHandler.java
@@ -1,28 +1,13 @@
 package com.xxl.job.core.handler;
 
 import com.xxl.job.core.biz.model.ReturnT;
-import com.xxl.job.core.log.XxlJobFileAppender;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * remote job handler
  * @author xuxueli 2015-12-19 19:06:38
  */
 public abstract class IJobHandler {
-	private static Logger logger = LoggerFactory.getLogger(IJobHandler.class);
 
-	/**
-	 * append log
-	 *
-	 * @param appendLog
-	 */
-	public void log(String appendLog) {
-		String logFileName = XxlJobFileAppender.contextHolder.get();
-		XxlJobFileAppender.appendLog(logFileName, appendLog);
-		logger.info("xxl-job log [{}]: {}", logFileName, appendLog);
-	}
-	
 	/**
 	 * job handler
 	 * @param params
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 b5c0d85f..a105e402 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
@@ -2,15 +2,13 @@ package com.xxl.job.core.handler.impl;
 
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.IJobHandler;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.xxl.job.core.log.XxlJobLogger;
 
 /**
  * glue job handler
  * @author xuxueli 2016-5-19 21:05:45
  */
 public class GlueJobHandler extends IJobHandler {
-	private static Logger logger = LoggerFactory.getLogger(GlueJobHandler.class);
 
 	private long glueUpdatetime;
 	private IJobHandler jobHandler;
@@ -24,7 +22,7 @@ public class GlueJobHandler extends IJobHandler {
 
 	@Override
 	public ReturnT<String> execute(String... params) throws Exception {
-		logger.info("----------- 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/log/XxlJobLogger.java b/xxl-job-core/src/main/java/com/xxl/job/core/log/XxlJobLogger.java
new file mode 100644
index 00000000..4bc6a4f9
--- /dev/null
+++ b/xxl-job-core/src/main/java/com/xxl/job/core/log/XxlJobLogger.java
@@ -0,0 +1,43 @@
+package com.xxl.job.core.log;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+/**
+ * Created by xuxueli on 17/4/28.
+ */
+public class XxlJobLogger {
+    private static Logger logger = LoggerFactory.getLogger("xxl-job logger");
+    private static SimpleDateFormat xxlJobLoggerFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+    /**
+     * append log
+     *
+     * @param appendLog
+     */
+    public static void log(String appendLog) {
+
+        // "yyyy-MM-dd HH:mm:ss [ClassName]-[MethodName]-[LineNumber]-[ThreadName] log";
+        StackTraceElement[] stackTraceElements = new Throwable().getStackTrace();
+        StackTraceElement callInfo = stackTraceElements[1];
+
+        StringBuffer stringBuffer = new StringBuffer();
+        stringBuffer.append(xxlJobLoggerFormat.format(new Date())).append(" ")
+            .append("["+ callInfo.getClassName() +"]").append("-")
+            .append("["+ callInfo.getMethodName() +"]").append("-")
+            .append("["+ callInfo.getLineNumber() +"]").append("-")
+            .append("["+ Thread.currentThread().getName() +"]").append(" ")
+            .append(appendLog!=null?appendLog:"");
+        String formatAppendLog = stringBuffer.toString();
+
+        // appendlog
+        String logFileName = XxlJobFileAppender.contextHolder.get();
+        XxlJobFileAppender.appendLog(logFileName, formatAppendLog);
+
+        logger.warn("[{}]: {}", logFileName, formatAppendLog);
+    }
+
+}
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 b0cfb971..2c84364a 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
@@ -5,6 +5,7 @@ import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.biz.model.TriggerParam;
 import com.xxl.job.core.handler.IJobHandler;
 import com.xxl.job.core.log.XxlJobFileAppender;
+import com.xxl.job.core.log.XxlJobLogger;
 import org.eclipse.jetty.util.ConcurrentHashSet;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -80,7 +81,7 @@ public class JobThread extends Thread{
 						String logFileName = XxlJobFileAppender.makeLogFileName(new Date(triggerParam.getLogDateTim()), triggerParam.getLogId());
 
 						XxlJobFileAppender.contextHolder.set(logFileName);
-						logger.info("----------- xxl-job job execute start -----------");
+						XxlJobLogger.log("----------- xxl-job job execute start -----------");
 
 						executeResult = handler.execute(handlerParams);
 						if (executeResult == null) {
@@ -88,7 +89,7 @@ public class JobThread extends Thread{
 						}
 					} catch (Exception e) {
 						if (toStop) {
-							logger.error("<br>----------- xxl-job toStop, stopReason:{}", stopReason);
+							XxlJobLogger.log("<br>----------- xxl-job toStop, stopReason:" + stopReason);
 						}
 						logger.error("JobThread Exception:", e);
 						StringWriter out = new StringWriter();
@@ -96,8 +97,9 @@ public class JobThread extends Thread{
 
 						executeResult = new ReturnT<String>(ReturnT.FAIL_CODE, out.toString());
 					}
-					logger.info("----------- xxl-job job execute end ----------- <br> Look : ExecutorParams:{}, Code:{}, Msg:{}",
-							new Object[]{handlerParams, executeResult.getCode(), executeResult.getMsg()});
+
+					XxlJobLogger.log("----------- xxl-job job execute end ----------- <br> " +
+									"Look : ExecutorParams:"+ handlerParams +", Code:"+ executeResult.getCode() +", Msg:" + executeResult.getMsg());
 					
 					// callback handler info
 					if (!toStop) {
@@ -111,9 +113,16 @@ public class JobThread extends Thread{
 				}
 			} catch (Exception e) {
 				if (toStop) {
-					logger.error("<br>----------- xxl-job toStop, stopReason:{}", stopReason);
+					XxlJobLogger.log("<br>----------- xxl-job toStop, stopReason:" + stopReason);
 				}
-				logger.error("----------- xxl-job JobThread Exception:", e);
+
+				StringWriter stringWriter = new StringWriter();
+				PrintWriter printWriter = new PrintWriter(stringWriter, true);
+				e.printStackTrace(printWriter);
+				printWriter.flush();
+				stringWriter.flush();
+				String errorMsg = stringWriter.toString();
+				XxlJobLogger.log("----------- xxl-job JobThread Exception:" + errorMsg);
 			}
 		}
 		
diff --git a/xxl-job-executor-example/src/main/java/com/xxl/job/executor/service/jobhandler/DemoJobHandler.java b/xxl-job-executor-example/src/main/java/com/xxl/job/executor/service/jobhandler/DemoJobHandler.java
index 556e1b5f..4fe6c8be 100644
--- a/xxl-job-executor-example/src/main/java/com/xxl/job/executor/service/jobhandler/DemoJobHandler.java
+++ b/xxl-job-executor-example/src/main/java/com/xxl/job/executor/service/jobhandler/DemoJobHandler.java
@@ -3,8 +3,7 @@ package com.xxl.job.executor.service.jobhandler;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.IJobHandler;
 import com.xxl.job.core.handler.annotation.JobHander;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.xxl.job.core.log.XxlJobLogger;
 import org.springframework.stereotype.Service;
 
 import java.util.concurrent.TimeUnit;
@@ -17,20 +16,20 @@ import java.util.concurrent.TimeUnit;
  * 1、继承 “IJobHandler” ；
  * 2、装配到Spring，例如加 “@Service” 注解；
  * 3、加 “@JobHander” 注解，注解value值为新增任务生成的JobKey的值;多个JobKey用逗号分割;
+ * 4、执行日志：需要通过 "XxlJobLogger.log" 打印执行日志；
  * 
  * @author xuxueli 2015-12-19 19:43:36
  */
 @JobHander(value="demoJobHandler")
 @Service
 public class DemoJobHandler extends IJobHandler {
-	private static transient Logger logger = LoggerFactory.getLogger(DemoJobHandler.class);
 
 	@Override
 	public ReturnT<String> execute(String... params) throws Exception {
-		super.log("XXL-JOB, Hello World.");
+		XxlJobLogger.log("XXL-JOB, Hello World.");
 		
 		for (int i = 0; i < 5; i++) {
-			super.log("beat at:" + i);
+			XxlJobLogger.log("beat at:" + i);
 			TimeUnit.SECONDS.sleep(2);
 		}
 		return ReturnT.SUCCESS;