Skip to content

Commit 5903a00

Browse files
committed
Add slf4j jul bridge
1 parent e698709 commit 5903a00

File tree

3 files changed

+16
-5
lines changed

3 files changed

+16
-5
lines changed

kepler/kepler.target

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
<unit id="org.slf4j.api.source" version="1.7.2.v20121108-1250"/>
2222
<unit id="ch.qos.logback.slf4j" version="1.0.7.v20121108-1250"/>
2323
<unit id="ch.qos.logback.slf4j.source" version="1.0.7.v20121108-1250"/>
24+
<unit id="org.slf4j.jul" version="1.7.2.v20121108-1250"/>
25+
<unit id="org.slf4j.jul.source" version="1.7.2.v20121108-1250"/>
2426
</location>
2527
</locations>
2628
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>

net.sourceforge.pmd.eclipse.plugin/META-INF/MANIFEST.MF

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ Require-Bundle: org.apache.commons.logging;bundle-version="1.0.4",
1919
org.eclipse.wst.xml.core,
2020
org.eclipse.ui.workbench.texteditor,
2121
ch.qos.logback.classic,
22-
ch.qos.logback.core
22+
ch.qos.logback.core,
23+
org.slf4j.jul
2324
Bundle-ActivationPolicy: lazy
2425
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
2526
Bundle-Vendor: %plugin.provider

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/logging/internal/LogbackConfiguration.java

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@
99
import org.eclipse.core.runtime.Status;
1010
import org.slf4j.ILoggerFactory;
1111
import org.slf4j.LoggerFactory;
12+
import org.slf4j.bridge.SLF4JBridgeHandler;
1213

1314
import net.sourceforge.pmd.eclipse.plugin.PMDPlugin;
1415

16+
import ch.qos.logback.classic.Logger;
1517
import ch.qos.logback.classic.LoggerContext;
1618
import ch.qos.logback.classic.encoder.PatternLayoutEncoder;
1719
import ch.qos.logback.classic.filter.ThresholdFilter;
@@ -43,8 +45,12 @@ public void configureLogback() {
4345
logbackEclipseAppender.setName(PMDPlugin.PLUGIN_ID);
4446
logbackEclipseAppender.start();
4547

46-
ch.qos.logback.classic.Logger l = logbackContext.getLogger(ROOT_LOG_ID);
48+
Logger l = logbackContext.getLogger(ROOT_LOG_ID);
4749
l.addAppender(logbackEclipseAppender);
50+
51+
if (!SLF4JBridgeHandler.isInstalled()) {
52+
SLF4JBridgeHandler.install();
53+
}
4854
}
4955

5056
public void unconfigureLogback() {
@@ -53,8 +59,10 @@ public void unconfigureLogback() {
5359
return;
5460
}
5561

56-
ch.qos.logback.classic.Logger l = logbackContext.getLogger(ROOT_LOG_ID);
62+
Logger l = logbackContext.getLogger(ROOT_LOG_ID);
5763
l.detachAndStopAllAppenders();
64+
65+
SLF4JBridgeHandler.uninstall();
5866
}
5967

6068
private void configureLogs(String logFileName, String logLevel) {
@@ -96,7 +104,7 @@ private void configureLogs(String logFileName, String logLevel) {
96104

97105
appender.start();
98106

99-
ch.qos.logback.classic.Logger rootLogger = logbackContext.getLogger(ROOT_LOG_ID);
107+
Logger rootLogger = logbackContext.getLogger(ROOT_LOG_ID);
100108
rootLogger.addAppender(appender);
101109
}
102110

@@ -106,7 +114,7 @@ public void applyLogPreferences(String logFileName, String logLevel) {
106114
return;
107115
}
108116

109-
ch.qos.logback.classic.Logger rootLogger = logbackContext.getLogger(ROOT_LOG_ID);
117+
Logger rootLogger = logbackContext.getLogger(ROOT_LOG_ID);
110118
Appender<ILoggingEvent> appender = rootLogger.getAppender(PMD_ECLIPSE_APPENDER_NAME);
111119
if (appender != null) {
112120
rootLogger.detachAppender(appender);

0 commit comments

Comments
 (0)