From a882682199af34569c87533b7ff809cad2b0faab Mon Sep 17 00:00:00 2001 From: Puja Jagani Date: Fri, 31 Jan 2025 10:49:42 +0530 Subject: [PATCH] [java] Ensure Selenium logging options are respected if java logging properties are not set Fixes #14160 and #15176 --- .../org/openqa/selenium/grid/log/LoggingOptions.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/java/src/org/openqa/selenium/grid/log/LoggingOptions.java b/java/src/org/openqa/selenium/grid/log/LoggingOptions.java index 60b3a96ca9cc6..bbe976f9f105f 100644 --- a/java/src/org/openqa/selenium/grid/log/LoggingOptions.java +++ b/java/src/org/openqa/selenium/grid/log/LoggingOptions.java @@ -98,8 +98,14 @@ public void configureLogging() { return; } - // Keep current loggers if they are being manually set - if (LogManager.getLogManager().getProperty("handlers") != null) return; + String configClass = System.getProperty("java.util.logging.config.class"); + String configFile = System.getProperty("java.util.logging.config.file"); + + // Check if the java logging config class or file is set. If so, give that priority. + // Else default to the Selenium logging and respect the Selenium logging options. + if (configClass != null || configFile != null) { + return; + } // Remove all handlers from existing loggers LogManager logManager = LogManager.getLogManager();