vanzin commented on a change in pull request #26798: [SPARK-30167][REPL] Log4j
configuration for REPL can't override the root logger properly.
URL: https://github.com/apache/spark/pull/26798#discussion_r357786243
##########
File path: repl/src/test/scala/org/apache/spark/repl/ReplSuite.scala
##########
@@ -297,4 +299,110 @@ class ReplSuite extends SparkFunSuite with
BeforeAndAfterAll {
assertContains("successful", output)
}
+ test("SPARK-30167: Log4j configuration for REPL should override root logger
properly") {
+ val testConfiguration =
+ """
+ |# Set everything to be logged to the console
+ |log4j.rootCategory=INFO, console
+ |log4j.appender.console=org.apache.log4j.ConsoleAppender
+ |log4j.appender.console.target=System.err
+ |log4j.appender.console.layout=org.apache.log4j.PatternLayout
+ |log4j.appender.console.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss}
%p %c{1}: %m%n
+ |
+ |# Set the log level for this class to WARN same as the default
setting.
+ |log4j.logger.org.apache.spark.repl.Main=ERROR
+ |""".stripMargin
+
+ val log4jprops = Files.createTempFile("log4j.properties.d",
"log4j.properties")
+ Files.write(log4jprops, testConfiguration.getBytes)
+
+ val originalRootLogger = LogManager.getRootLogger
+ val originalRootAppender = originalRootLogger.getAppender("file")
+ val originalStderr = System.err
+ val originalReplThresholdLevel = Logging.sparkShellThresholdLevel
+
+ val replLoggerLogMessage = "Log level for REPL: "
+ val warnLogMessage1 = "warnLogMessage1 should not be output"
+ val errorLogMessage1 = "errorLogMessage1 should be output"
+ val infoLogMessage1 = "infoLogMessage2 should be output"
+ val infoLogMessage2 = "infoLogMessage3 should be output"
+
+ val out = try {
+ PropertyConfigurator.configure(log4jprops.toString)
+
+ // Re-initialization is needed to set SparkShellLoggingFilter to
ConsoleAppender
+ Main.initializeForcefully(true, false)
+ runInterpreter("local",
+ s"""
+ |import java.io.{ByteArrayOutputStream, PrintStream}
+ |
+ |import org.apache.log4j.{ConsoleAppender, Level, LogManager}
+ |
+ |val replLogger =
LogManager.getLogger("${Main.getClass.getName.stripSuffix("$")}")
+ |
+ |// Log level for REPL is expected to be ERROR
+ |"$replLoggerLogMessage" + replLogger.getLevel()
+ |
+ |val bout = new ByteArrayOutputStream()
+ |
+ |// Configure stderr to let log messages output to
ByteArrayOutputStream.
+ |val defaultErrStream: PrintStream = System.err
+ |try {
+ | System.setErr(new PrintStream(bout))
+ |
+ | // Reconfigure ConsoleAppender to reflect the stderr setting.
+ | val consoleAppender =
+ |
LogManager.getRootLogger.getAllAppenders.nextElement.asInstanceOf[ConsoleAppender]
+ | consoleAppender.activateOptions()
+ |
+ | // customLogger1 is not explicitly configured neither its log
level nor appender
+ | // so this inherits the settings of rootLogger
+ | // but ConsoleAppender can use a different log level.
+ | val customLogger1 = LogManager.getLogger("customLogger1")
+ | customLogger1.warn("$warnLogMessage1")
+ | customLogger1.error("$errorLogMessage1")
+ |
+ | // customLogger2 is explicitly configured its log level as INFO
+ | // so info level messages logged via customLogger2 should be
output.
+ | val customLogger2 = LogManager.getLogger("customLogger2")
+ | customLogger2.setLevel(Level.INFO)
+ | customLogger2.info("$infoLogMessage1")
+ |
+ | // customLogger2 is explicitly configured its log level
+ | // so its child should inherit the settings.
+ | val customLogger3 = LogManager.getLogger("customLogger2.child")
+ | customLogger3.info("$infoLogMessage2")
+ |
+ | // echo log messages
+ | bout.toString
+ |} finally {
+ | System.setErr(defaultErrStream)
+ |}
+ |""".stripMargin)
+ } finally {
+ // Restore log4j settings for this suite
+ val log4jproperties = Thread.currentThread()
Review comment:
Hmm, `LogManager.resetConfiguration` doesn't seem to be called if you have a
custom log4j.properties, so maybe this is needed... (Don't remember why that is
the case, though.)
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
