Skip to content

Commit f926879

Browse files
TommyLemonTommyLemon
committed
优化日志类，新增支持打印 Throwable 和默认级别
1 parent fc25526 commit f926879

1 file changed

Lines changed: 39 additions & 16 deletions

File tree

  • APIJSONORM/src/main/java/apijson

‎APIJSONORM/src/main/java/apijson/Log.java‎

Lines changed: 39 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,21 @@
77

88
import java.text.SimpleDateFormat;
99

10-
/**测试用Log
10+
/**测试用日志
1111
* @modifier Lemon
1212
*/
1313
public class Log {
14+
public static boolean DEBUG = false;
1415

15-
public static boolean DEBUG = true;
16+
public static final String LEVEL_VERBOSE = "VERBOSE";
17+
public static final String LEVEL_INFO = "INFO";
18+
public static final String LEVEL_DEBUG = "DEBUG";
19+
public static final String LEVEL_WARN = "WARN";
20+
public static final String LEVEL_ERROR = "ERROR";
1621

17-
public static final String VERSION = "8.1.3";
22+
public static String LEVEL = LEVEL_WARN;
23+
24+
public static final String VERSION = "8.1.5";
1825
public static final String KEY_SYSTEM_INFO_DIVIDER = "\n---|-----APIJSON SYSTEM INFO-----|---\n";
1926

2027
public static final String OS_NAME;
@@ -46,23 +53,26 @@ public static void setDateFormat(String dateFormatString) {
4653
* @param msg
4754
* @param level
4855
*/
49-
public static void logInfo(String TAG, String msg, String level){
50-
if(level.equals("DEBUG") || level .equals("ERROR") ||level.equals("WARN")){
51-
System.err.println(DATE_FORMAT.format(System.currentTimeMillis()) + ": " + TAG + "." + level + ": " + msg);
56+
public static void logInfo(String TAG, String msg, String level) {
57+
if (level == null || level.isEmpty()) {
58+
level = LEVEL;
5259
}
53-
else if(level.equals("VERBOSE") || level .equals("INFO") ){
60+
61+
if (level.equals(LEVEL_VERBOSE) || level.equals(LEVEL_INFO)) {
5462
System.out.println(DATE_FORMAT.format(System.currentTimeMillis()) + ": " + TAG + "." + level + ": " + msg);
5563
}
64+
else if (level.equals(LEVEL_DEBUG) || level.equals(LEVEL_ERROR) || level.equals(LEVEL_WARN)) {
65+
System.err.println(DATE_FORMAT.format(System.currentTimeMillis()) + ": " + TAG + "." + level + ": " + msg);
66+
}
5667
}
5768

58-
5969
/**
6070
* @param TAG
6171
* @param msg
6272
*/
6373
public static void d(String TAG, String msg) {
6474
if (DEBUG) {
65-
logInfo(TAG,msg,"DEBUG");
75+
logInfo(TAG, msg, LEVEL_DEBUG);
6676
}
6777
}
6878

@@ -72,7 +82,7 @@ public static void d(String TAG, String msg) {
7282
* @param msg debug messages
7383
*/
7484
public static void fd(String TAG, String msg) {
75-
logInfo(TAG,msg,"DEBUG");
85+
logInfo(TAG, msg, LEVEL_DEBUG);
7686
}
7787

7888
/**
@@ -81,8 +91,8 @@ public static void fd(String TAG, String msg) {
8191
* @param symbol used for generating separation line
8292
* @param post postfix
8393
*/
84-
public static void sl(String pre,char symbol ,String post) {
85-
System.err.println(pre+new String(new char[48]).replace('\u0000', symbol)+post);
94+
public static void sl(String pre, char symbol, String post) {
95+
System.err.println(pre + new String(new char[48]).replace('\u0000', symbol) + post);
8696
}
8797

8898
/**
@@ -91,7 +101,7 @@ public static void sl(String pre,char symbol ,String post) {
91101
*/
92102
public static void v(String TAG, String msg) {
93103
if (DEBUG) {
94-
logInfo(TAG,msg,"VERBOSE");
104+
logInfo(TAG, msg, LEVEL_VERBOSE);
95105
}
96106
}
97107

@@ -101,7 +111,7 @@ public static void v(String TAG, String msg) {
101111
*/
102112
public static void i(String TAG, String msg) {
103113
if (DEBUG) {
104-
logInfo(TAG,msg,"INFO");
114+
logInfo(TAG, msg, LEVEL_INFO);
105115
}
106116
}
107117

@@ -111,7 +121,20 @@ public static void i(String TAG, String msg) {
111121
*/
112122
public static void e(String TAG, String msg) {
113123
if (DEBUG) {
114-
logInfo(TAG,msg,"ERROR");
124+
logInfo(TAG, msg, LEVEL_ERROR);
125+
}
126+
}
127+
128+
/**
129+
* @param TAG
130+
* @param msg
131+
*/
132+
public static void e(String TAG, String msg, Throwable e) {
133+
if (DEBUG) {
134+
if (e != null) {
135+
e.printStackTrace();
136+
}
137+
logInfo(TAG, msg, LEVEL_ERROR);
115138
}
116139
}
117140

@@ -121,7 +144,7 @@ public static void e(String TAG, String msg) {
121144
*/
122145
public static void w(String TAG, String msg) {
123146
if (DEBUG) {
124-
logInfo(TAG,msg,"WARN");
147+
logInfo(TAG, msg, LEVEL_WARN);
125148
}
126149
}
127150

0 commit comments

Comments
 (0)