Skip to content

Scoped context #2438

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

Merged
merged 21 commits into from
Apr 15, 2024
Merged

Scoped context #2438

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
193ed95
Add ScopedContext and ResourceLogger
rgoers Mar 27, 2024
86aac20
ResourceLogger uses ScopedContext
rgoers Mar 29, 2024
63765d1
Use ExtendedLoggerWrapper
rgoers Mar 29, 2024
44b19b0
Move ContextDataProviders to the API
rgoers Apr 3, 2024
d398dae
Update docs
rgoers Apr 3, 2024
37e2b22
Remove ParameterizedMapMessage
rgoers Apr 3, 2024
4848144
Remove ParameterizedMapMessage from test
rgoers Apr 3, 2024
7f63f31
Fix typo
rgoers Apr 3, 2024
b26c2e2
Ensure unit test uses a unique file name
rgoers Apr 4, 2024
9ca817a
Move non-API classes to core
rgoers Apr 4, 2024
0291e46
Revert unit test change. Correct site changes
rgoers Apr 4, 2024
e7751cd
Fix comment
rgoers Apr 4, 2024
c82a083
Remove the Scopedcontext.Renderable interface
rgoers Apr 4, 2024
cf01425
Fix site conflicts
rgoers Apr 4, 2024
7f9c7e8
Delegate `ScopedContext` functionality to interface
ppkarwasz Apr 4, 2024
e28affa
Incorporate Piotr's changes - mostly
rgoers Apr 5, 2024
ebc3aaf
Return raw object as it was stored. Add wrap methods
rgoers Apr 6, 2024
307120d
merge changes from 2.x branch
rgoers Apr 6, 2024
132c2d3
More abstractions
rgoers Apr 11, 2024
a2397ee
Merge branch '2.x' into ScopedContext
rgoers Apr 11, 2024
3ef49c5
Fix javadoc comment
rgoers Apr 11, 2024
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
Prev Previous commit
Next Next commit
Ensure unit test uses a unique file name
  • Loading branch information
@rgoers
rgoers committed Apr 4, 2024
commit b26c2e278143b7e967a01e5b7414419dbb6de9be
2 changes: 1 addition & 1 deletion ...rc/test/java/org/apache/logging/log4j/core/appender/routing/JsonRoutingAppender2Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
*/
public class JsonRoutingAppender2Test {
private static final String CONFIG = "log4j-routing2.json";
private static final String LOG_FILENAME = "target/rolling1/rollingtest-Unknown.log";
private static final String LOG_FILENAME = "target/rolling1/routingtest2-Unknown.log";

private final LoggerContextRule loggerContextRule = new LoggerContextRule(CONFIG);

Expand Down
2 changes: 1 addition & 1 deletion log4j-core-test/src/test/resources/log4j-routing2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*/
{ "configuration": { "status": "error", "name": "RoutingTest",
"properties": {
"property": { "name": "filename", "value" : "target/rolling1/rollingtest-$${sd:type}.log" }
"property": { "name": "filename", "value" : "target/rolling1/routingtest2-$${sd:type}.log" }
},
"ThresholdFilter": { "level": "debug" },
"appenders": {
Expand Down