Skip to content

Apache Lucene open-source search software

Include *.out.log files in the cleanup. #14385

Dawid Weiss6f0ec0be95b6
diff --git a/gradle/hacks/wipe-temp.gradle b/gradle/hacks/wipe-temp.gradle
index 6d9a201042d..1ae2e502ac5 100644
--- a/gradle/hacks/wipe-temp.gradle
+++ b/gradle/hacks/wipe-temp.gradle
@@ -21,7 +21,6 @@ import java.time.Instant
// See LUCENE-9471. We redirect temporary location for gradle
// so that it doesn't pollute user's tmp. Wipe it during a clean though.
-
configure(rootProject) {
gradle.buildFinished {
// we clean up the java.io.tmpdir we've redirected gradle to use (LUCENE-9471).
@@ -32,16 +31,24 @@ configure(rootProject) {
// clean up any files older than 3 hours from the user's gradle temp. the time
// limit is added so that we don't interfere with any concurrent builds... just in case.
- def gradleTmp = rootProject.gradle.gradleUserHomeDir.toPath().resolve(".tmp")
+ Instant deadline = Instant.now().minus(3, ChronoUnit.HOURS);
+ def toDelete = new ArrayList<>()
+
+ def gradleTmp = gradle.gradleUserHomeDir.toPath().resolve(".tmp")
if (Files.exists(gradleTmp)) {
- Instant deadline = Instant.now().minus(3, ChronoUnit.HOURS);
- try (var stream = Files.list(gradleTmp)) {
- stream.forEach(path -> {
- if (Files.getLastModifiedTime(path).toInstant().isBefore(deadline)) {
- Files.deleteIfExists(path);
- }
- });
- }
+ toDelete.add(Files.list(gradleTmp))
+ }
+ def daemonDir = gradle.gradleUserHomeDir.toPath().resolve("daemon").resolve("${gradle.gradleVersion}")
+ if (Files.exists(daemonDir)) {
+ toDelete.add(Files.list(daemonDir).filter(path -> path.toString().endsWith(".out.log")))
+ }
+
+ try (def stream = toDelete.stream().flatMap(p -> p)) {
+ stream.filter(p -> Files.isRegularFile(p))
+ .filter(p -> Files.getLastModifiedTime(p).toInstant().isBefore(deadline))
+ .forEach(p -> {
+ Files.deleteIfExists(p)
+ })
}
}
}