Skip to content

Commit

Permalink
moved from log4j to logback
Browse files Browse the repository at this point in the history
  • Loading branch information
@overheadhunter
overheadhunter committed May 16, 2017
1 parent 05cc248 commit 2d68e27
Show file tree
Hide file tree
Showing 9 changed files with 51 additions and 264 deletions.
12 changes: 4 additions & 8 deletions main/launcher/pom.xml
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -42,16 +42,12 @@


<!-- Logging --> <!-- Logging -->
<dependency> <dependency>
<groupId>org.apache.logging.log4j</groupId> <groupId>ch.qos.logback</groupId>
<artifactId>log4j-core</artifactId> <artifactId>logback-core</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.logging.log4j</groupId> <groupId>ch.qos.logback</groupId>
<artifactId>log4j-slf4j-impl</artifactId> <artifactId>logback-classic</artifactId>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-jul</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>
132 changes: 0 additions & 132 deletions main/launcher/src/main/java/org/cryptomator/logging/ConfigurableFileAppender.java
View file

This file was deleted.

35 changes: 18 additions & 17 deletions main/launcher/src/main/java/org/cryptomator/logging/DebugMode.java
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -6,29 +6,27 @@
package org.cryptomator.logging; package org.cryptomator.logging;


import static java.util.Arrays.asList; import static java.util.Arrays.asList;
import static org.apache.logging.log4j.LogManager.ROOT_LOGGER_NAME;


import java.util.Collection; import java.util.Collection;


import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Singleton; import javax.inject.Singleton;


import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.core.LoggerContext;
import org.apache.logging.log4j.core.config.Configuration;
import org.apache.logging.log4j.core.config.LoggerConfig;
import org.cryptomator.common.settings.Settings; import org.cryptomator.common.settings.Settings;
import org.slf4j.Logger; import org.slf4j.ILoggerFactory;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;


import ch.qos.logback.classic.Level;
import ch.qos.logback.classic.Logger;
import ch.qos.logback.classic.LoggerContext;

@Singleton @Singleton
public class DebugMode { public class DebugMode {


private static final Logger LOG = LoggerFactory.getLogger(DebugMode.class); private static final org.slf4j.Logger LOG = LoggerFactory.getLogger(DebugMode.class);


private static final Collection<LoggerUpgrade> LOGGER_UPGRADES = asList( // private static final Collection<LoggerUpgrade> LOGGER_UPGRADES = asList( //
loggerUpgrade(ROOT_LOGGER_NAME, Level.INFO), // loggerUpgrade(org.slf4j.Logger.ROOT_LOGGER_NAME, Level.INFO), //
loggerUpgrade("org.cryptomator", Level.TRACE), // loggerUpgrade("org.cryptomator", Level.TRACE), //
loggerUpgrade("org.eclipse.jetty.server.Server", Level.DEBUG) // loggerUpgrade("org.eclipse.jetty.server.Server", Level.DEBUG) //
); );
Expand All @@ -48,10 +46,13 @@ public void initialize() {
} }


private void enable() { private void enable() {
LoggerContext context = (LoggerContext) LogManager.getContext(false); ILoggerFactory loggerFactory = LoggerFactory.getILoggerFactory();
Configuration config = context.getConfiguration(); if (loggerFactory instanceof LoggerContext) {
LOGGER_UPGRADES.forEach(loggerUpgrade -> loggerUpgrade.execute(config)); LoggerContext context = (LoggerContext) loggerFactory;
context.updateLoggers(); LOGGER_UPGRADES.forEach(loggerUpgrade -> loggerUpgrade.execute(context));
} else {
LOG.warn("SLF4J not bound to Logback.");
}
} }


private static LoggerUpgrade loggerUpgrade(String loggerName, Level minLevel) { private static LoggerUpgrade loggerUpgrade(String loggerName, Level minLevel) {
Expand All @@ -68,10 +69,10 @@ public LoggerUpgrade(String loggerName, Level minLevel) {
this.level = minLevel; this.level = minLevel;
} }


public void execute(Configuration config) { public void execute(LoggerContext context) {
LoggerConfig loggerConfig = config.getLoggerConfig(loggerName); Logger logger = context.getLogger(loggerName);
if (loggerConfig.getLevel().isMoreSpecificThan(level)) { if (logger.getLevel().isGreaterOrEqual(level)) {
loggerConfig.setLevel(level); logger.setLevel(level);
} }
} }


Expand Down
49 changes: 0 additions & 49 deletions main/launcher/src/main/resources/log4j2.xml
View file

This file was deleted.

33 changes: 0 additions & 33 deletions main/launcher/src/test/resources/log4j2.xml
View file

This file was deleted.

18 changes: 18 additions & 0 deletions main/launcher/src/test/resources/logback-test.xml
View file
Original file line number Original file line Diff line number Diff line change
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE xml>
<!-- log config used during unit tests and starts from IDE. For production please specify -Dlogback.configurationFile=/path/to/config -->
<configuration scan="true" debug="true">

<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
</encoder>
</appender>

<logger name="org.cryptomator" level="INFO" />
<logger name="org.eclipse.jetty.server.Server" level="INFO" />

<root level="DEBUG">
<appender-ref ref="STDOUT" />
</root>
</configuration>
19 changes: 7 additions & 12 deletions main/pom.xml
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
<cryptomator.cryptofs.version>1.2.2</cryptomator.cryptofs.version> <cryptomator.cryptofs.version>1.2.2</cryptomator.cryptofs.version>
<cryptomator.webdav.version>0.6.0</cryptomator.webdav.version> <cryptomator.webdav.version>0.6.0</cryptomator.webdav.version>
<cryptomator.jni.version>1.0.2</cryptomator.jni.version> <cryptomator.jni.version>1.0.2</cryptomator.jni.version>
<log4j.version>2.8.1</log4j.version> <!-- keep in sync with https://github.com/edwgiz/maven-shaded-log4j-transformer (used in uber-jar), or wait for https://issues.apache.org/jira/browse/LOG4J2-954 fix -->
<slf4j.version>1.7.25</slf4j.version> <slf4j.version>1.7.25</slf4j.version>
<logback.version>1.2.2</logback.version>
<junit.version>4.12</junit.version> <junit.version>4.12</junit.version>
<junit.hierarchicalrunner.version>4.12.1</junit.hierarchicalrunner.version> <junit.hierarchicalrunner.version>4.12.1</junit.hierarchicalrunner.version>
<hamcrest.version>1.3</hamcrest.version> <!-- keep in sync with version required by JUnit --> <hamcrest.version>1.3</hamcrest.version> <!-- keep in sync with version required by JUnit -->
Expand Down Expand Up @@ -119,19 +119,14 @@
<version>${slf4j.version}</version> <version>${slf4j.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.logging.log4j</groupId> <groupId>ch.qos.logback</groupId>
<artifactId>log4j-core</artifactId> <artifactId>logback-core</artifactId>
<version>${log4j.version}</version> <version>${logback.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.logging.log4j</groupId> <groupId>ch.qos.logback</groupId>
<artifactId>log4j-slf4j-impl</artifactId> <artifactId>logback-classic</artifactId>
<version>${log4j.version}</version> <version>${logback.version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-jul</artifactId>
<version>${log4j.version}</version>
</dependency> </dependency>


<!-- commons --> <!-- commons -->
Expand Down
9 changes: 0 additions & 9 deletions main/uber-jar/pom.xml
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -41,17 +41,8 @@
<Implementation-Version>${project.version}</Implementation-Version> <Implementation-Version>${project.version}</Implementation-Version>
</manifestEntries> </manifestEntries>
</transformer> </transformer>
<transformer implementation="com.github.edwgiz.mavenShadePlugin.log4j2CacheTransformer.PluginsCacheFileTransformer">
</transformer>
</transformers> </transformers>
</configuration> </configuration>
<dependencies>
<dependency>
<groupId>com.github.edwgiz</groupId>
<artifactId>maven-shade-plugin.log4j2-cachefile-transformer</artifactId>
<version>${log4j.version}</version>
</dependency>
</dependencies>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
Expand Down
Loading

0 comments on commit 2d68e27

Please sign in to comment.