|
|
@@ -19,9 +19,10 @@ public class XxlJobLogger {
|
|
19
|
19
|
/**
|
|
20
|
20
|
* append log
|
|
21
|
21
|
*
|
|
|
22
|
+ * @param callInfo
|
|
22
|
23
|
* @param appendLog
|
|
23
|
24
|
*/
|
|
24
|
|
- public static void log(String appendLog) {
|
|
|
25
|
+ private static void logDetail(StackTraceElement callInfo, String appendLog) {
|
|
25
|
26
|
|
|
26
|
27
|
// logFileName
|
|
27
|
28
|
String logFileName = XxlJobFileAppender.contextHolder.get();
|
|
|
@@ -29,9 +30,9 @@ public class XxlJobLogger {
|
|
29
|
30
|
return;
|
|
30
|
31
|
}
|
|
31
|
32
|
|
|
32
|
|
- // "yyyy-MM-dd HH:mm:ss [ClassName]-[MethodName]-[LineNumber]-[ThreadName] log";
|
|
|
33
|
+ /*// "yyyy-MM-dd HH:mm:ss [ClassName]-[MethodName]-[LineNumber]-[ThreadName] log";
|
|
33
|
34
|
StackTraceElement[] stackTraceElements = new Throwable().getStackTrace();
|
|
34
|
|
- StackTraceElement callInfo = stackTraceElements[1];
|
|
|
35
|
+ StackTraceElement callInfo = stackTraceElements[1];*/
|
|
35
|
36
|
|
|
36
|
37
|
StringBuffer stringBuffer = new StringBuffer();
|
|
37
|
38
|
stringBuffer.append(xxlJobLoggerFormat.format(new Date())).append(" ")
|
|
|
@@ -55,8 +56,14 @@ public class XxlJobLogger {
|
|
55
|
56
|
* @param appendLogArguments like "111, true"
|
|
56
|
57
|
*/
|
|
57
|
58
|
public static void log(String appendLogPattern, Object ... appendLogArguments) {
|
|
58
|
|
- String appendLog = MessageFormat.format(appendLogPattern, appendLogArguments);
|
|
59
|
|
- log(appendLog);
|
|
|
59
|
+
|
|
|
60
|
+ String appendLog = appendLogPattern;
|
|
|
61
|
+ if (appendLogArguments!=null && appendLogArguments.length>0) {
|
|
|
62
|
+ appendLog = MessageFormat.format(appendLogPattern, appendLogArguments);
|
|
|
63
|
+ }
|
|
|
64
|
+
|
|
|
65
|
+ StackTraceElement callInfo = new Throwable().getStackTrace()[1];
|
|
|
66
|
+ logDetail(callInfo, appendLog);
|
|
60
|
67
|
}
|
|
61
|
68
|
|
|
62
|
69
|
/**
|
|
|
@@ -65,10 +72,13 @@ public class XxlJobLogger {
|
|
65
|
72
|
* @param e
|
|
66
|
73
|
*/
|
|
67
|
74
|
public static void log(Throwable e) {
|
|
|
75
|
+
|
|
68
|
76
|
StringWriter stringWriter = new StringWriter();
|
|
69
|
77
|
e.printStackTrace(new PrintWriter(stringWriter));
|
|
70
|
78
|
String appendLog = stringWriter.toString();
|
|
71
|
|
- log(appendLog);
|
|
|
79
|
+
|
|
|
80
|
+ StackTraceElement callInfo = new Throwable().getStackTrace()[1];
|
|
|
81
|
+ logDetail(callInfo, appendLog);
|
|
72
|
82
|
}
|
|
73
|
83
|
|
|
74
|
84
|
}
|