소스 검색

Merge pull request #407 from shangxiaobin/master

"修复打印有参日志时报错的问题"

赞!这种方式确实兼容性更好,更加优雅!
许雪里 7 년 전
부모
커밋
eb850d76ca
1개의 변경된 파일13개의 추가작업 그리고 9개의 파일을 삭제
  1. 13 9
      xxl-job-core/src/main/java/com/xxl/job/core/log/XxlJobLogger.java

+ 13 - 9
xxl-job-core/src/main/java/com/xxl/job/core/log/XxlJobLogger.java

@@ -1,14 +1,15 @@
 package com.xxl.job.core.log;
 package com.xxl.job.core.log;
 
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.io.PrintWriter;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.io.StringWriter;
-import java.text.MessageFormat;
 import java.text.SimpleDateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Date;
 
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.helpers.FormattingTuple;
+import org.slf4j.helpers.MessageFormatter;
+
 /**
 /**
  * Created by xuxueli on 17/4/28.
  * Created by xuxueli on 17/4/28.
  */
  */
@@ -54,12 +55,15 @@ public class XxlJobLogger {
      */
      */
     public static void log(String appendLogPattern, Object ... appendLogArguments) {
     public static void log(String appendLogPattern, Object ... appendLogArguments) {
 
 
-        String appendLog = appendLogPattern;
-        if (appendLogArguments!=null && appendLogArguments.length>0) {
-            appendLog = MessageFormat.format(appendLogPattern, appendLogArguments);
-        }
-
+    	FormattingTuple ft = MessageFormatter.format(appendLogPattern, appendLogArguments);
+        
+        String appendLog = ft.getMessage();
         StackTraceElement callInfo = new Throwable().getStackTrace()[1];
         StackTraceElement callInfo = new Throwable().getStackTrace()[1];
+        
+//        appendLog = appendLogPattern;
+//        if (appendLogArguments!=null && appendLogArguments.length>0) {
+//            appendLog = MessageFormat.format(appendLogPattern, appendLogArguments);
+//        }
         logDetail(callInfo, appendLog);
         logDetail(callInfo, appendLog);
     }
     }