1.7.0 release and 增加logback支持

ltsopensource · Mar 6, 2017 · 2cd6652 · 2cd6652
1 parent 3ef521a
commit 2cd6652
Show file tree

Hide file tree

Showing 18 changed files with 197 additions and 33 deletions.
diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@ oschina地址:
 
 这两个地址都会同步更新。感兴趣，请加QQ群：109500214 一起探讨、完善。越多人支持，就越有动力去更新，喜欢记得右上角star哈。
 
-##1.7.0-SNAPSHOT(master)变更主要点
+##1.7.0(master)变更主要点
 1. 增加手动触发任务按钮
 2. 优化PreLoader
 

diff --git a/build.cmd b/build.cmd
@@ -4,7 +4,7 @@ start mvn clean install -DskipTests
 echo "LTS: mvn clean install -DskipTests"
 echo "LTS: After sub window finished, close it , and press any key to continue" & pause>nul
 
-set VERSION=1.7.0-SNAPSHOT
+set VERSION=1.7.0
 set BASE_HOME=%~dp0%
 set DIST_BIN_DIR=lts-%VERSION%-bin
 

diff --git a/build.sh b/build.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-VERSION="1.7.0-SNAPSHOT"
+VERSION="1.7.0"
 
 LTS_BIN="${BASH_SOURCE-$0}"
 LTS_BIN="$(dirname "${LTS_BIN}")"

diff --git a/lts-admin/pom.xml b/lts-admin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lts-parent</artifactId>
         <groupId>com.github.ltsopensource</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>war</packaging>
@@ -215,4 +215,4 @@
             <artifactId>mongo-java-driver</artifactId>
         </dependency>
     </dependencies>
-</project>
+</project>
diff --git a/lts-core/pom.xml b/lts-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lts-parent</artifactId>
         <groupId>com.github.ltsopensource</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
@@ -136,5 +136,10 @@
             <groupId>org.javassist</groupId>
             <artifactId>javassist</artifactId>
         </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
-</project>
+</project>
diff --git a/lts-core/src/main/java/com/github/ltsopensource/core/logger/LoggerFactory.java b/lts-core/src/main/java/com/github/ltsopensource/core/logger/LoggerFactory.java
@@ -4,6 +4,7 @@
 import com.github.ltsopensource.core.logger.jcl.JclLoggerAdapter;
 import com.github.ltsopensource.core.logger.jdk.JdkLoggerAdapter;
 import com.github.ltsopensource.core.logger.log4j.Log4jLoggerAdapter;
+import com.github.ltsopensource.core.logger.logback.LogbackLoggerAdapter;
 import com.github.ltsopensource.core.logger.slf4j.Slf4jLoggerAdapter;
 import com.github.ltsopensource.core.logger.support.FailsafeLogger;
 import com.github.ltsopensource.core.spi.ServiceLoader;
@@ -28,7 +29,9 @@ private LoggerFactory() {
     // 查找常用的日志框架
     static {
         String logger = System.getProperty("lts.logger");
-        if ("slf4j".equals(logger)) {
+        if ("logback".equals(logger)) {
+            setLoggerAdapter(new LogbackLoggerAdapter());
+        } else if ("slf4j".equals(logger)) {
             setLoggerAdapter(new Slf4jLoggerAdapter());
         } else if ("jcl".equals(logger)) {
             setLoggerAdapter(new JclLoggerAdapter());
@@ -38,15 +41,19 @@ private LoggerFactory() {
             setLoggerAdapter(new JdkLoggerAdapter());
         } else {
             try {
-                setLoggerAdapter(new Slf4jLoggerAdapter());
-            } catch (Throwable e1) {
+                setLoggerAdapter(new LogbackLoggerAdapter());
+            } catch (Throwable e0) {
                 try {
-                    setLoggerAdapter(new Log4jLoggerAdapter());
-                } catch (Throwable e2) {
+                    setLoggerAdapter(new Slf4jLoggerAdapter());
+                } catch (Throwable e1) {
                     try {
-                        setLoggerAdapter(new JclLoggerAdapter());
-                    } catch (Throwable e3) {
-                        setLoggerAdapter(new JdkLoggerAdapter());
+                        setLoggerAdapter(new Log4jLoggerAdapter());
+                    } catch (Throwable e2) {
+                        try {
+                            setLoggerAdapter(new JclLoggerAdapter());
+                        } catch (Throwable e3) {
+                            setLoggerAdapter(new JdkLoggerAdapter());
+                        }
                     }
                 }
             }
@@ -132,4 +139,4 @@ public static File getFile() {
         return LOGGER_ADAPTER.getFile();
     }
 
-}
+}
diff --git a/lts-core/src/main/java/com/github/ltsopensource/core/logger/logback/LogbackLogger.java b/lts-core/src/main/java/com/github/ltsopensource/core/logger/logback/LogbackLogger.java
@@ -0,0 +1,96 @@
+package com.github.ltsopensource.core.logger.logback;
+
+import com.github.ltsopensource.core.logger.Logger;
+import com.github.ltsopensource.core.logger.support.AbstractLogger;
+
+import java.io.Serializable;
+
+public class LogbackLogger  extends AbstractLogger implements Logger, Serializable {
+
+    private static final long serialVersionUID = 1L;
+    private final ch.qos.logback.classic.Logger logger;
+
+    public LogbackLogger(ch.qos.logback.classic.Logger logger) {
+        this.logger = logger;
+    }
+
+    public void trace(String msg) {
+        logger.trace(msg);
+    }
+
+    public void trace(Throwable e) {
+        logger.trace(e.getMessage(), e);
+    }
+
+    public void trace(String msg, Throwable e) {
+        logger.trace(msg, e);
+    }
+
+    public void debug(String msg) {
+        logger.debug(msg);
+    }
+
+    public void debug(Throwable e) {
+        logger.debug(e.getMessage(), e);
+    }
+
+    public void debug(String msg, Throwable e) {
+        logger.debug(msg, e);
+    }
+
+    public void info(String msg) {
+        logger.info(msg);
+    }
+
+    public void info(Throwable e) {
+        logger.info(e.getMessage(), e);
+    }
+
+    public void info(String msg, Throwable e) {
+        logger.info(msg, e);
+    }
+
+    public void warn(String msg) {
+        logger.warn(msg);
+    }
+
+    public void warn(Throwable e) {
+        logger.warn(e.getMessage(), e);
+    }
+
+    public void warn(String msg, Throwable e) {
+        logger.warn(msg, e);
+    }
+
+    public void error(String msg) {
+        logger.error(msg);
+    }
+
+    public void error(Throwable e) {
+        logger.error(e.getMessage(), e);
+    }
+
+    public void error(String msg, Throwable e) {
+        logger.error(msg, e);
+    }
+
+    public boolean isTraceEnabled() {
+        return logger.isTraceEnabled();
+    }
+
+    public boolean isDebugEnabled() {
+        return logger.isDebugEnabled();
+    }
+
+    public boolean isInfoEnabled() {
+        return logger.isInfoEnabled();
+    }
+
+    public boolean isWarnEnabled() {
+        return logger.isWarnEnabled();
+    }
+
+    public boolean isErrorEnabled() {
+        return logger.isErrorEnabled();
+    }
+}
diff --git a/...core/src/main/java/com/github/ltsopensource/core/logger/logback/LogbackLoggerAdapter.java b/...core/src/main/java/com/github/ltsopensource/core/logger/logback/LogbackLoggerAdapter.java
@@ -0,0 +1,49 @@
+package com.github.ltsopensource.core.logger.logback;
+
+import com.github.ltsopensource.core.logger.Level;
+import com.github.ltsopensource.core.logger.Logger;
+import com.github.ltsopensource.core.logger.LoggerAdapter;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+
+public class LogbackLoggerAdapter implements LoggerAdapter {
+
+    public LogbackLoggerAdapter() {
+        try {
+            Class.forName("ch.qos.logback.classic.Logger");
+        } catch (ClassNotFoundException e) {
+            throw new RuntimeException("ch.qos.logback.classic.Logger not found");
+        }
+    }
+
+    public Logger getLogger(String key) {
+        return new LogbackLogger((ch.qos.logback.classic.Logger) LoggerFactory.getLogger(key));
+    }
+
+    public Logger getLogger(Class<?> key) {
+        return new LogbackLogger((ch.qos.logback.classic.Logger) LoggerFactory.getLogger(key));
+    }
+
+    private Level level;
+
+    private File file;
+
+    public void setLevel(Level level) {
+        this.level = level;
+    }
+
+    public Level getLevel() {
+        return level;
+    }
+
+    public File getFile() {
+        return file;
+    }
+
+    public void setFile(File file) {
+        this.file = file;
+    }
+
+}
+
diff --git a/lts-core/src/main/java/com/github/ltsopensource/core/support/Version.java b/lts-core/src/main/java/com/github/ltsopensource/core/support/Version.java
@@ -20,7 +20,7 @@ private Version() {}
 
     private static final Logger LOGGER = LoggerFactory.getLogger(Version.class);
 
-    private static final String VERSION = getVersion(Version.class, "1.7.0-SNAPSHOT");
+    private static final String VERSION = getVersion(Version.class, "1.7.0");
 
     static {
         // 检查是否存在重复的jar包
@@ -113,4 +113,4 @@ public static void checkDuplicate(String path, boolean failOnError) {
         }
     }
 
-}
+}
diff --git a/...c/main/resources/META-INF/lts/internal/com.github.ltsopensource.core.logger.LoggerAdapter b/...c/main/resources/META-INF/lts/internal/com.github.ltsopensource.core.logger.LoggerAdapter
@@ -1,4 +1,5 @@
 slf4j=com.github.ltsopensource.core.logger.slf4j.Slf4jLoggerAdapter
 jcl=com.github.ltsopensource.core.logger.jcl.JclLoggerAdapter
 log4j=com.github.ltsopensource.core.logger.log4j.Log4jLoggerAdapter
-jdk=com.github.ltsopensource.core.logger.jdk.JdkLoggerAdapter
+jdk=com.github.ltsopensource.core.logger.jdk.JdkLoggerAdapter
+logback=com.github.ltsopensource.core.logger.logback.LogbackLoggerAdapter
diff --git a/lts-jobclient/pom.xml b/lts-jobclient/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lts-parent</artifactId>
         <groupId>com.github.ltsopensource</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -19,4 +19,4 @@
         </dependency>
     </dependencies>
 
-</project>
+</project>
diff --git a/lts-jobtracker/pom.xml b/lts-jobtracker/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lts-parent</artifactId>
         <groupId>com.github.ltsopensource</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -19,4 +19,4 @@
         </dependency>
     </dependencies>
 
-</project>
+</project>
diff --git a/lts-monitor/pom.xml b/lts-monitor/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lts-parent</artifactId>
         <groupId>com.github.ltsopensource</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -24,4 +24,4 @@
         </dependency>
     </dependencies>
 
-</project>
+</project>
diff --git a/lts-spring/pom.xml b/lts-spring/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lts-parent</artifactId>
         <groupId>com.github.ltsopensource</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
@@ -89,4 +89,4 @@
         </plugins>
     </build>
 
-</project>
+</project>
diff --git a/lts-startup/pom.xml b/lts-startup/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lts-parent</artifactId>
         <groupId>com.github.ltsopensource</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>

diff --git a/lts-tasktracker/pom.xml b/lts-tasktracker/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lts-parent</artifactId>
         <groupId>com.github.ltsopensource</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -25,4 +25,4 @@
     </dependencies>
 
 
-</project>
+</project>
diff --git a/lts/pom.xml b/lts/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>lts-parent</artifactId>
         <groupId>com.github.ltsopensource</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.7.0</version>
     </parent>
     <packaging>jar</packaging>
     <modelVersion>4.0.0</modelVersion>
@@ -330,4 +330,4 @@
         </plugins>
     </build>
 
-</project>
+</project>