-
-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
more tests pass, Disabled ConditionalTest in logback-classic and logb…
…ack-access
- Loading branch information
Showing
15 changed files
with
176 additions
and
83 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
18 changes: 18 additions & 0 deletions
18
logback-access/src/main/java/ch/qos/logback/access/model/ConfigurationModel.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| package ch.qos.logback.access.model; | ||
|
|
||
| import ch.qos.logback.core.model.Model; | ||
|
|
||
| public class ConfigurationModel extends Model { | ||
| public static final String INTERNAL_DEBUG_ATTR = "debug"; | ||
|
|
||
| String debug; | ||
|
|
||
| public String getDebug() { | ||
| return debug; | ||
| } | ||
|
|
||
| public void setDebug(String debug) { | ||
| this.debug = debug; | ||
| } | ||
|
|
||
| } |
70 changes: 70 additions & 0 deletions
70
...access/src/main/java/ch/qos/logback/access/model/processor/ConfigurationModelHandler.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| package ch.qos.logback.access.model.processor; | ||
|
|
||
| import ch.qos.logback.access.model.ConfigurationModel; | ||
| import ch.qos.logback.core.Context; | ||
| import ch.qos.logback.core.joran.spi.InterpretationContext; | ||
| import ch.qos.logback.core.model.Model; | ||
| import ch.qos.logback.core.model.processor.ModelHandlerBase; | ||
| import ch.qos.logback.core.model.processor.ModelHandlerException; | ||
| import ch.qos.logback.core.status.OnConsoleStatusListener; | ||
| import ch.qos.logback.core.util.OptionHelper; | ||
| import ch.qos.logback.core.util.StatusListenerConfigHelper; | ||
|
|
||
| public class ConfigurationModelHandler extends ModelHandlerBase { | ||
| static final String DEBUG_SYSTEM_PROPERTY_KEY = "logback-access.debug"; | ||
|
|
||
| public ConfigurationModelHandler(Context context) { | ||
| super(context); | ||
| } | ||
|
|
||
| protected Class<ConfigurationModel> getSupportedModelClass() { | ||
| return ConfigurationModel.class; | ||
| } | ||
|
|
||
| @Override | ||
| public void handle(InterpretationContext intercon, Model model) throws ModelHandlerException { | ||
| ConfigurationModel configurationModel = (ConfigurationModel) model; | ||
| // See LBCLASSIC-225 (the system property is looked up first. Thus, it overrides | ||
| // the equivalent property in the config file. This reversal of scope priority | ||
| // is justified | ||
| // by the use case: the admin trying to chase rogue config file | ||
| String debug = System.getProperty(DEBUG_SYSTEM_PROPERTY_KEY); | ||
| if (debug == null) { | ||
| debug = configurationModel.getDebug(); | ||
| } | ||
| if (OptionHelper.isEmpty(debug) || debug.equals("false") || debug.equals("null")) { | ||
| addInfo(ConfigurationModel.INTERNAL_DEBUG_ATTR + " attribute not set"); | ||
| } else { | ||
| StatusListenerConfigHelper.addOnConsoleListenerInstance(context, new OnConsoleStatusListener()); | ||
| } | ||
|
|
||
| intercon.pushObject(context); | ||
| } | ||
|
|
||
| @Override | ||
| public void postHandle(InterpretationContext intercon, Model model) throws ModelHandlerException { | ||
| addInfo("End of configuration."); | ||
| intercon.popObject(); | ||
| } | ||
|
|
||
| // public void begin(InterpretationContext ec, String name, Attributes attributes) { | ||
| // | ||
| // // See LBCLASSIC-225 (the system property is looked up first. Thus, it overrides | ||
| // // the equivalent property in the config file. This reversal of scope priority is justified | ||
| // // by the use case: the admin trying to chase rogue config file | ||
| // String debugAttrib = System.getProperty(DEBUG_SYSTEM_PROPERTY_KEY); | ||
| // if (debugAttrib == null) { | ||
| // debugAttrib = attributes.getValue(INTERNAL_DEBUG_ATTR); | ||
| // } | ||
| // | ||
| // if (OptionHelper.isEmpty(debugAttrib) || debugAttrib.equals("false") || debugAttrib.equals("null")) { | ||
| // addInfo(INTERNAL_DEBUG_ATTR + " attribute not set"); | ||
| // } else { | ||
| // StatusListenerConfigHelper.addOnConsoleListenerInstance(context, new OnConsoleStatusListener()); | ||
| // } | ||
| // | ||
| // // the context is appender attachable, so it is pushed on top of the stack | ||
| // ec.pushObject(getContext()); | ||
| // } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 4 additions & 0 deletions
4
logback-classic/src/test/input/joran/conditional/conditionalIncludeExistingFile.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.