Skip to content

Fix appender-ref resolution in complex appenders inside SiftingAppender #938

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix appender-ref resolution in complex appenders inside SiftingAppender #938

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion logback-core/src/main/java/ch/qos/logback/core/joran/JoranConfiguratorBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ protected void addElementSelectorAndActionAssociations(RuleStore rs) {
rs.addRule(new ElementSelector("configuration/statusListener"), StatusListenerAction::new);

rs.addRule(new ElementSelector("*/appender"), AppenderAction::new);
rs.addRule(new ElementSelector("configuration/appender/appender-ref"), AppenderRefAction::new);
rs.addRule(new ElementSelector("*/appender/appender-ref"), AppenderRefAction::new);
rs.addRule(new ElementSelector("configuration/newRule"), NewRuleAction::new);

rs.addRule(new ElementSelector("*/param"), ParamAction::new);
Expand Down
1 change: 1 addition & 0 deletions logback-core/src/main/java/ch/qos/logback/core/joran/JoranConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,6 @@ public abstract class JoranConstants {

public static final String APPENDER_BAG = "APPENDER_BAG";
public static final String APPENDER_REF_BAG = "APPENDER_REF_BAG";
public static final String PARENT_APPENDER_BAG = "PARENT_APPENDER_BAG";
// public static final String FILTER_CHAIN_BAG = "FILTER_CHAIN_BAG";
}
9 changes: 8 additions & 1 deletion logback-core/src/main/java/ch/qos/logback/core/model/processor/AppenderRefModelHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,16 @@ void attachRefencedAppenders(ModelInterpretationContext mic, AppenderRefModel ap
AppenderAttachable<?> appenderAttachable) {
String appenderName = mic.subst(appenderRefModel.getRef());

Map<String, Appender> appenderBag = (Map<String, Appender>) mic.getObjectMap().get(JoranConstants.APPENDER_BAG);
Map<String, Appender> appenderBag = (Map<String, Appender>) mic.getObjectMap().get(JoranConstants.APPENDER_BAG);

Appender appender = appenderBag.get(appenderName);
if (appender == null) {
Map<String, Appender> parentAppenderBag = (Map<String, Appender>) mic.getObjectMap().get(JoranConstants.PARENT_APPENDER_BAG);
if (parentAppenderBag) != null) {
appender = parentAppenderBag.get(appenderName);
}
}

if (appender == null) {
addError("Failed to find appender named [" + appenderName + "]");
} else {
Expand Down
1 change: 1 addition & 0 deletions ...ck-core/src/main/java/ch/qos/logback/core/model/processor/ModelInterpretationContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ public ModelInterpretationContext(ModelInterpretationContext otherMic) {
variableSubstitutionsHelper = new VariableSubstitutionsHelper(context, otherMic.getCopyOfPropertyMap());
defaultNestedComponentRegistry.duplicate(otherMic.getDefaultNestedComponentRegistry());
createAppenderBags();
objectMap.put(JoranConstants.PARENT_APPENDER_BAG, new HashMap<String, Appender<?>>((Map<String, Appender<?>>)otherMic.objectMap.get(JoranConstants.APPENDER_BAG)));
}

public Map<String, Object> getObjectMap() {
Expand Down
3 changes: 3 additions & 0 deletions logback-core/src/main/java/ch/qos/logback/core/sift/AppenderFactoryUsingSiftModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,14 @@
import ch.qos.logback.core.joran.spi.DefaultNestedComponentRegistry;
import ch.qos.logback.core.joran.spi.JoranException;
import ch.qos.logback.core.model.AppenderModel;
import ch.qos.logback.core.model.AppenderRefModel;
import ch.qos.logback.core.model.ImplicitModel;
import ch.qos.logback.core.model.Model;
import ch.qos.logback.core.model.ParamModel;
import ch.qos.logback.core.model.PropertyModel;
import ch.qos.logback.core.model.SiftModel;
import ch.qos.logback.core.model.processor.AppenderModelHandler;
import ch.qos.logback.core.model.processor.AppenderRefModelHandler;
import ch.qos.logback.core.model.processor.ImplicitModelHandler;
import ch.qos.logback.core.model.processor.ModelInterpretationContext;
import ch.qos.logback.core.model.processor.PropertyModelHandler;
Expand Down Expand Up @@ -67,6 +69,7 @@ public boolean hasDependers(String dependeeName) {
siftProcessor.addHandler(PropertyModel.class, PropertyModelHandler::makeInstance);
siftProcessor.addHandler(ImplicitModel.class, ImplicitModelHandler::makeInstance);
siftProcessor.addHandler(AppenderModel.class, AppenderModelHandler::makeInstance);
siftProcessor.addHandler(AppenderRefModel.class, AppenderRefModelHandler::makeInstance);
siftProcessor.addHandler(SiftModel.class, NOPSiftModelHandler::makeInstance);

return siftProcessor;
Expand Down