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

[2.8.x] Fix missed ContextInitializer#configureByResource (backport #11910) by @tsuyoshizawa #11915

Merged
merged 2 commits into from
Aug 12, 2023
Merged

[2.8.x] Fix missed ContextInitializer#configureByResource (backport #11910) by @tsuyoshizawa #11915

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2767f53
ported configureByResource from logback
tsuyoshizawa Aug 11, 2023
333f81e
Comments
mkurz Aug 12, 2023
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
20 changes: 18 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 @@ -8,9 +8,11 @@ import java.io.File
import java.net.URL

import ch.qos.logback.classic._
import ch.qos.logback.classic.joran.JoranConfigurator
import ch.qos.logback.classic.jul.LevelChangePropagator
import ch.qos.logback.classic.util.ContextInitializer
import ch.qos.logback.core.util._
import ch.qos.logback.core.LogbackException
import org.slf4j.ILoggerFactory
import org.slf4j.LoggerFactory
import org.slf4j.bridge._
Expand Down Expand Up @@ -121,8 +123,7 @@ class LogbackLoggerConfigurator extends LoggerConfigurator {

config match {
case Some(url) =>
val initializer = new ContextInitializer(ctx)
initializer.configureByResource(url)
configureByResource(ctx, url)
case None =>
System.err.println("Could not detect a logback configuration file, not configuring logback")
}
Expand All @@ -131,6 +132,21 @@ class LogbackLoggerConfigurator extends LoggerConfigurator {
}
}

/**
* Copied from https://github.com/qos-ch/logback/commit/4b06e062488e4cb87f22be6ae96e4d7d6350ed6b
* See #11907
*/
private def configureByResource(ctx: LoggerContext, url: URL): Unit = {
val urlString = url.toString
if (urlString.endsWith("xml")) {
val configurator = new JoranConfigurator()
configurator.setContext(ctx)
configurator.doConfigure(url)
} else {
throw new LogbackException("Unexpected filename extension of file [" + url + "]. Should be .xml")
}
}

/**
* Shutdown the logger infrastructure.
*/
Expand Down