Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions java/src/org/openqa/selenium/grid/log/LoggingOptions.java
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
Loading