Skip to content

SOLR-18107: fix Log4j2Watcher, register parents #4113

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

Open
dsmiley wants to merge 1 commit into
base: main
Choose a base branch
from
Open

SOLR-18107: fix Log4j2Watcher, register parents #4113

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 31 additions & 20 deletions solr/core/src/java/org/apache/solr/logging/log4j2/Log4j2Watcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,16 +90,6 @@ public Log4j2Info(String name, Level level, boolean isSet) {

private final boolean isSet;

@Override
public String getLevel() {
return (level != null) ? level : null;
}

@Override
public String getName() {
return name;
}

@Override
public boolean isSet() {
return isSet;
Expand Down Expand Up @@ -199,12 +189,15 @@ public Collection<LoggerInfo> getAllLoggers() {
continue;
}

// NOTE: just because we have an explicit configuration, doesn't mean we have an explitly set
// level
// (Configuration might be for some other property, and level is still inherited)
// NOTE: just because we have an explicit configuration, doesn't mean we have an explicitly
// set level (Configuration might be for some other property, and level is still inherited)
map.putIfAbsent(
name,
new Log4j2Info(name, logger.getLevel(), null != config.getValue().getExplicitLevel()));

// Also add parent loggers in the hierarchy, as they are relevant for level inheritance
// This ensures parent loggers appear even if not in ctx.getLoggers()
addParentLoggers(name, map, ctx);
}

// Now add any "in use" loggers (that aren't already explicitly configured) and their parents
Expand All @@ -218,18 +211,36 @@ public Collection<LoggerInfo> getAllLoggers() {
// If we didn't already see a LoggerConfig for these loggers, then their level is
// not (explicitly) set
map.putIfAbsent(name, new Log4j2Info(name, logger.getLevel(), false));
while (true) {
int dot = name.lastIndexOf('.');
if (dot < 0) break;

name = name.substring(0, dot);
map.putIfAbsent(name, new Log4j2Info(name, logger.getLevel(), false));
}
addParentLoggers(name, map, ctx);
}

return map.values();
}

/**
* Adds all parent loggers in the hierarchy for the given logger name.
*
* <p>For example, given "org.apache.solr.core.SolrCore", this will add:
*
* <ul>
* <li>"org.apache.solr.core"
* <li>"org.apache.solr"
* <li>"org"
* </ul>
*/
private void addParentLoggers(
String loggerName, Map<String, LoggerInfo> map, LoggerContext ctx) {
String parentName = loggerName;
while (true) {
int dot = parentName.lastIndexOf('.');
if (dot < 0) break;

parentName = parentName.substring(0, dot);
map.putIfAbsent(
parentName, new Log4j2Info(parentName, ctx.getLogger(parentName).getLevel(), false));
}
}

@Override
public void setThreshold(String level) {
Log4j2Appender app = getAppender();
Expand Down
Loading