Skip to content

Commit 2cd6652

Browse files
qq254963746qq254963746
committed
1.7.0 release and 增加logback支持
1 parent 3ef521a commit 2cd6652

File tree

18 files changed

+197
-33
lines changed

18 files changed

+197
-33
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ oschina地址:
1717

1818
这两个地址都会同步更新。感兴趣，请加QQ群：109500214 一起探讨、完善。越多人支持，就越有动力去更新，喜欢记得右上角star哈。
1919

20-
##1.7.0-SNAPSHOT(master)变更主要点
20+
##1.7.0(master)变更主要点
2121
1. 增加手动触发任务按钮
2222
2. 优化PreLoader
2323

‎build.cmd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ start mvn clean install -DskipTests
44
echo "LTS: mvn clean install -DskipTests"
55
echo "LTS: After sub window finished, close it , and press any key to continue" & pause>nul
66

7-
set VERSION=1.7.0-SNAPSHOT
7+
set VERSION=1.7.0
88
set BASE_HOME=%~dp0%
99
set DIST_BIN_DIR=lts-%VERSION%-bin
1010

‎build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22

3-
VERSION="1.7.0-SNAPSHOT"
3+
VERSION="1.7.0"
44

55
LTS_BIN="${BASH_SOURCE-$0}"
66
LTS_BIN="$(dirname "${LTS_BIN}")"

‎lts-admin/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>lts-parent</artifactId>
77
<groupId>com.github.ltsopensource</groupId>
8-
<version>1.7.0-SNAPSHOT</version>
8+
<version>1.7.0</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111
<packaging>war</packaging>
@@ -215,4 +215,4 @@
215215
<artifactId>mongo-java-driver</artifactId>
216216
</dependency>
217217
</dependencies>
218-
</project>
218+
</project>

‎lts-core/pom.xml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>lts-parent</artifactId>
77
<groupId>com.github.ltsopensource</groupId>
8-
<version>1.7.0-SNAPSHOT</version>
8+
<version>1.7.0</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111
<packaging>jar</packaging>
@@ -136,5 +136,10 @@
136136
<groupId>org.javassist</groupId>
137137
<artifactId>javassist</artifactId>
138138
</dependency>
139+
<dependency>
140+
<groupId>ch.qos.logback</groupId>
141+
<artifactId>logback-classic</artifactId>
142+
<scope>provided</scope>
143+
</dependency>
139144
</dependencies>
140-
</project>
145+
</project>

‎lts-core/src/main/java/com/github/ltsopensource/core/logger/LoggerFactory.java‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import com.github.ltsopensource.core.logger.jcl.JclLoggerAdapter;
55
import com.github.ltsopensource.core.logger.jdk.JdkLoggerAdapter;
66
import com.github.ltsopensource.core.logger.log4j.Log4jLoggerAdapter;
7+
import com.github.ltsopensource.core.logger.logback.LogbackLoggerAdapter;
78
import com.github.ltsopensource.core.logger.slf4j.Slf4jLoggerAdapter;
89
import com.github.ltsopensource.core.logger.support.FailsafeLogger;
910
import com.github.ltsopensource.core.spi.ServiceLoader;
@@ -28,7 +29,9 @@ private LoggerFactory() {
2829
// 查找常用的日志框架
2930
static {
3031
String logger = System.getProperty("lts.logger");
31-
if ("slf4j".equals(logger)) {
32+
if ("logback".equals(logger)) {
33+
setLoggerAdapter(new LogbackLoggerAdapter());
34+
} else if ("slf4j".equals(logger)) {
3235
setLoggerAdapter(new Slf4jLoggerAdapter());
3336
} else if ("jcl".equals(logger)) {
3437
setLoggerAdapter(new JclLoggerAdapter());
@@ -38,15 +41,19 @@ private LoggerFactory() {
3841
setLoggerAdapter(new JdkLoggerAdapter());
3942
} else {
4043
try {
41-
setLoggerAdapter(new Slf4jLoggerAdapter());
42-
} catch (Throwable e1) {
44+
setLoggerAdapter(new LogbackLoggerAdapter());
45+
} catch (Throwable e0) {
4346
try {
44-
setLoggerAdapter(new Log4jLoggerAdapter());
45-
} catch (Throwable e2) {
47+
setLoggerAdapter(new Slf4jLoggerAdapter());
48+
} catch (Throwable e1) {
4649
try {
47-
setLoggerAdapter(new JclLoggerAdapter());
48-
} catch (Throwable e3) {
49-
setLoggerAdapter(new JdkLoggerAdapter());
50+
setLoggerAdapter(new Log4jLoggerAdapter());
51+
} catch (Throwable e2) {
52+
try {
53+
setLoggerAdapter(new JclLoggerAdapter());
54+
} catch (Throwable e3) {
55+
setLoggerAdapter(new JdkLoggerAdapter());
56+
}
5057
}
5158
}
5259
}
@@ -132,4 +139,4 @@ public static File getFile() {
132139
return LOGGER_ADAPTER.getFile();
133140
}
134141

135-
}
142+
}

‎lts-core/src/main/java/com/github/ltsopensource/core/logger/logback/LogbackLogger.java‎

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
package com.github.ltsopensource.core.logger.logback;
2+
3+
import com.github.ltsopensource.core.logger.Logger;
4+
import com.github.ltsopensource.core.logger.support.AbstractLogger;
5+
6+
import java.io.Serializable;
7+
8+
public class LogbackLogger extends AbstractLogger implements Logger, Serializable {
9+
10+
private static final long serialVersionUID = 1L;
11+
private final ch.qos.logback.classic.Logger logger;
12+
13+
public LogbackLogger(ch.qos.logback.classic.Logger logger) {
14+
this.logger = logger;
15+
}
16+
17+
public void trace(String msg) {
18+
logger.trace(msg);
19+
}
20+
21+
public void trace(Throwable e) {
22+
logger.trace(e.getMessage(), e);
23+
}
24+
25+
public void trace(String msg, Throwable e) {
26+
logger.trace(msg, e);
27+
}
28+
29+
public void debug(String msg) {
30+
logger.debug(msg);
31+
}
32+
33+
public void debug(Throwable e) {
34+
logger.debug(e.getMessage(), e);
35+
}
36+
37+
public void debug(String msg, Throwable e) {
38+
logger.debug(msg, e);
39+
}
40+
41+
public void info(String msg) {
42+
logger.info(msg);
43+
}
44+
45+
public void info(Throwable e) {
46+
logger.info(e.getMessage(), e);
47+
}
48+
49+
public void info(String msg, Throwable e) {
50+
logger.info(msg, e);
51+
}
52+
53+
public void warn(String msg) {
54+
logger.warn(msg);
55+
}
56+
57+
public void warn(Throwable e) {
58+
logger.warn(e.getMessage(), e);
59+
}
60+
61+
public void warn(String msg, Throwable e) {
62+
logger.warn(msg, e);
63+
}
64+
65+
public void error(String msg) {
66+
logger.error(msg);
67+
}
68+
69+
public void error(Throwable e) {
70+
logger.error(e.getMessage(), e);
71+
}
72+
73+
public void error(String msg, Throwable e) {
74+
logger.error(msg, e);
75+
}
76+
77+
public boolean isTraceEnabled() {
78+
return logger.isTraceEnabled();
79+
}
80+
81+
public boolean isDebugEnabled() {
82+
return logger.isDebugEnabled();
83+
}
84+
85+
public boolean isInfoEnabled() {
86+
return logger.isInfoEnabled();
87+
}
88+
89+
public boolean isWarnEnabled() {
90+
return logger.isWarnEnabled();
91+
}
92+
93+
public boolean isErrorEnabled() {
94+
return logger.isErrorEnabled();
95+
}
96+
}

‎lts-core/src/main/java/com/github/ltsopensource/core/logger/logback/LogbackLoggerAdapter.java‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
package com.github.ltsopensource.core.logger.logback;
2+
3+
import com.github.ltsopensource.core.logger.Level;
4+
import com.github.ltsopensource.core.logger.Logger;
5+
import com.github.ltsopensource.core.logger.LoggerAdapter;
6+
import org.slf4j.LoggerFactory;
7+
8+
import java.io.File;
9+
10+
public class LogbackLoggerAdapter implements LoggerAdapter {
11+
12+
public LogbackLoggerAdapter() {
13+
try {
14+
Class.forName("ch.qos.logback.classic.Logger");
15+
} catch (ClassNotFoundException e) {
16+
throw new RuntimeException("ch.qos.logback.classic.Logger not found");
17+
}
18+
}
19+
20+
public Logger getLogger(String key) {
21+
return new LogbackLogger((ch.qos.logback.classic.Logger) LoggerFactory.getLogger(key));
22+
}
23+
24+
public Logger getLogger(Class<?> key) {
25+
return new LogbackLogger((ch.qos.logback.classic.Logger) LoggerFactory.getLogger(key));
26+
}
27+
28+
private Level level;
29+
30+
private File file;
31+
32+
public void setLevel(Level level) {
33+
this.level = level;
34+
}
35+
36+
public Level getLevel() {
37+
return level;
38+
}
39+
40+
public File getFile() {
41+
return file;
42+
}
43+
44+
public void setFile(File file) {
45+
this.file = file;
46+
}
47+
48+
}
49+

‎lts-core/src/main/java/com/github/ltsopensource/core/support/Version.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ private Version() {}
2020

2121
private static final Logger LOGGER = LoggerFactory.getLogger(Version.class);
2222

23-
private static final String VERSION = getVersion(Version.class, "1.7.0-SNAPSHOT");
23+
private static final String VERSION = getVersion(Version.class, "1.7.0");
2424

2525
static {
2626
// 检查是否存在重复的jar包
@@ -113,4 +113,4 @@ public static void checkDuplicate(String path, boolean failOnError) {
113113
}
114114
}
115115

116-
}
116+
}

‎lts-core/src/main/resources/META-INF/lts/internal/com.github.ltsopensource.core.logger.LoggerAdapter‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
slf4j=com.github.ltsopensource.core.logger.slf4j.Slf4jLoggerAdapter
22
jcl=com.github.ltsopensource.core.logger.jcl.JclLoggerAdapter
33
log4j=com.github.ltsopensource.core.logger.log4j.Log4jLoggerAdapter
4-
jdk=com.github.ltsopensource.core.logger.jdk.JdkLoggerAdapter
4+
jdk=com.github.ltsopensource.core.logger.jdk.JdkLoggerAdapter
5+
logback=com.github.ltsopensource.core.logger.logback.LogbackLoggerAdapter

0 commit comments

Comments
 (0)