Skip to content
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

Protect logged exec spooling from no output #42177

Merged
merged 1 commit into from
May 16, 2019
Merged

Protect logged exec spooling from no output #42177

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
5 changes: 4 additions & 1 deletion buildSrc/src/main/minimumRuntime/org/elasticsearch/gradle/LoggedExec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,10 @@ public void setSpoolOutput(boolean spoolOutput) {
out = new LazyFileOutputStream(spoolFile);
outputLogger = logger -> {
try {
Files.lines(spoolFile.toPath()).forEach(logger::error);
// the file may not exist if the command never output anything
if (Files.exists(spoolFile.toPath())) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Is there any real benefit in doing Files.exists(spoolFile.toPath) vs simply spoolFile.exists()?

Files.lines(spoolFile.toPath()).forEach(logger::error);
}
} catch (IOException e) {
throw new RuntimeException("could not log", e);
}
Expand Down