Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[main] SLF4J 2 compatibility: avoid direct usage of StaticLoggerBinder (backport #11419) by @jfsoul #11429

Merged
merged 1 commit into from
Sep 16, 2022
Merged

[main] SLF4J 2 compatibility: avoid direct usage of StaticLoggerBinder (backport #11419) by @jfsoul #11429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions core/play-logback/src/main/scala/play/api/libs/logback/LogbackLoggerConfigurator.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ import ch.qos.logback.classic.jul.LevelChangePropagator
import ch.qos.logback.classic.util.ContextInitializer
import ch.qos.logback.core.util._
import org.slf4j.ILoggerFactory
import org.slf4j.LoggerFactory
import org.slf4j.bridge._
import org.slf4j.impl.StaticLoggerBinder
import play.api._

class LogbackLoggerConfigurator extends LoggerConfigurator {
def loggerFactory: ILoggerFactory = {
StaticLoggerBinder.getSingleton.getLoggerFactory
LoggerFactory.getILoggerFactory
}

/**
Expand Down
3 changes: 2 additions & 1 deletion documentation/manual/working/commonGuide/configuration/code/JavaLog4JLoggerConfigurator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import com.typesafe.config.Config;
import com.typesafe.config.ConfigFactory;
import org.slf4j.ILoggerFactory;
import org.slf4j.LoggerFactory;
import play.Environment;
import play.LoggerConfigurator;
import play.Mode;
Expand Down Expand Up @@ -65,7 +66,7 @@ public void configure(Map<String, String> properties, Optional<URL> config) {
LoggerContext loggerContext = (LoggerContext) LogManager.getContext(false);
loggerContext.setConfigLocation(config.get().toURI());

factory = org.slf4j.impl.StaticLoggerBinder.getSingleton().getLoggerFactory();
factory = LoggerFactory.getILoggerFactory();
} catch (URISyntaxException ex) {
throw new PlayException(
"log4j2.xml resource was not found",
Expand Down
3 changes: 2 additions & 1 deletion documentation/manual/working/commonGuide/configuration/code/Log4j2LoggerConfigurator.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import play.api.Configuration
import play.api.Environment
import play.api.LoggerConfigurator
import org.slf4j.ILoggerFactory
import org.slf4j.LoggerFactory

class Log4J2LoggerConfigurator extends LoggerConfigurator {
private var factory: ILoggerFactory = _
Expand Down Expand Up @@ -61,7 +62,7 @@ class Log4J2LoggerConfigurator extends LoggerConfigurator {
val context = LogManager.getContext(false).asInstanceOf[LoggerContext]
context.setConfigLocation(config.get.toURI)

factory = org.slf4j.impl.StaticLoggerBinder.getSingleton.getLoggerFactory
factory = LoggerFactory.getILoggerFactory
}

override def loggerFactory: ILoggerFactory = factory
Expand Down