Skip to content

MockLogAppender takes string logger names for capturing #104971

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
elasticsearchmachine merged 2 commits into from
Jan 31, 2024
Merged

MockLogAppender takes string logger names for capturing #104971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c0171f
MockLogAppender takes string logger names for capturing
ywangd Jan 31, 2024
3ad78fe
Use toList and remove redundant assignment
ywangd Jan 31, 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
2 changes: 1 addition & 1 deletion .../repository-s3/src/main/java/org/elasticsearch/repositories/s3/S3RetryingInputStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ private void maybeLogForSuccessAfterRetries(int initialAttempt, String action) {
action,
blobStore.bucket(),
blobKey,
purpose,
purpose.getKey(),
Copy link
Copy Markdown
Member Author

@ywangd ywangd Jan 31, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Irrelevant to this PR. But it's too trivial to have its own PR.

attempt - initialAttempt
);
}
Expand Down
9 changes: 8 additions & 1 deletion test/framework/src/main/java/org/elasticsearch/test/MockLogAppender.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,8 +241,15 @@ public String toString() {
}

public Releasable capturing(Class<?>... classes) {
return appendToLoggers(Arrays.stream(classes).map(LogManager::getLogger).toList());
}

public Releasable capturing(String... names) {
return appendToLoggers(Arrays.stream(names).map(LogManager::getLogger).toList());
}

private Releasable appendToLoggers(List<Logger> loggers) {
start();
final var loggers = Arrays.stream(classes).map(LogManager::getLogger).toArray(Logger[]::new);
for (final var logger : loggers) {
Loggers.addAppender(logger, this);
}
Expand Down