[LOG4J2-3413] Fixes resolution of non-Log4j properties #774
Conversation
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
For properties that does not start with `log4j` or `org.apache.logging.log4j` the loosed token-based lookup should not be applied. There are a couple of exceptions to this rule: the properties that start with `AsyncLogger` and those related to `disableThreadContext`. This PR prevents properties such as `level` to be used as a substitute for `log4j2.level`
ppkarwasz
changed the title
|
Yes, I thought JIRA would link the PR automatically, but apparently it only checks the title provided at submission time. |
ppkarwasz
commented
Feb 26, 2022
Comment on lines
+110
to
+116
| static { | ||
| // Add legacy properties without Log4j prefix | ||
| CACHE.put("disableThreadContext", Arrays.asList("disable", "thread", "context")); | ||
| CACHE.put("disableThreadContextStack", Arrays.asList("disable", "thread", "context", "stack")); | ||
| CACHE.put("disableThreadContextMap", Arrays.asList("disable", "thread", "context", "map")); | ||
| CACHE.put("isThreadContextMapInheritable", Arrays.asList("is", "thread", "context", "map", "inheritable")); | ||
| } |
There was a problem hiding this comment.
These are here just to satisfy LegacyPropertiesCompatibilityTest, which verifies that the tokenized version of the legacy and normalized properties are the same.
From the PropertiesUtil perspective they are not strictly necessary, since getStringProperty("disableThreadContext") will always look up at least the exact string "disableThreadContext" and it will retrieve the value before falling back to token-based comparison.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
For properties that does not start with
log4jororg.apache.logging.log4jthe loosed token-based lookup should not beapplied. There are a couple of exceptions to this rule: the properties that start with
AsyncLoggerand those related todisableThreadContext.This PR prevents properties such as
levelto be used as a substitute forlog4j2.level