SpringCloud/spring-cloud-contract
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

TemporaryFileStorage.TEMP_FILES_LOG full queue exception in larger projects gh-1282

Browse Source
This commit is contained in:
Marcin Grzejszczak
2019-12-10 15:53:23 +01:00
parent 1ec86207c5
commit 632cbe2865
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubRunner.java
View File

@@ -192,6 +192,7 @@ public class StubRunner implements StubRunning {
if (this.localStubRunner != null) {
this.localStubRunner.shutdown();
}
TemporaryFileStorage.cleanup(this.stubRunnerOptions.isDeleteStubsAfterTest());
}
}

22
spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/TemporaryFileStorage.java
View File

@@ -24,6 +24,7 @@ import java.nio.file.Path;
import java.nio.file.SimpleFileVisitor;
import java.nio.file.attribute.BasicFileAttributes;
import java.util.Queue;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
import org.apache.commons.logging.Log;
@@ -46,14 +47,15 @@ final class TemporaryFileStorage {
* we're creating a bounded in-memory storage of unpacked files and later we register
* a shutdown hook to remove all these files.
*/
private static final Queue<File> TEMP_FILES_LOG = new LinkedBlockingQueue<>(1000);
private static final BlockingQueue<File> TEMP_FILES_LOG = new LinkedBlockingQueue<>(
20_000);
private TemporaryFileStorage() {
throw new IllegalStateException("Can't instantiate a utility class");
}
static void add(File file) {
TEMP_FILES_LOG.add(file);
TEMP_FILES_LOG.offer(file);
}
static Queue<File> files() {
@@ -65,8 +67,8 @@ final class TemporaryFileStorage {
log.info("Will not clear temporary files due to switch");
return;
}
try {
for (File file : TemporaryFileStorage.files()) {
for (File file : TemporaryFileStorage.files()) {
try {
if (file.isDirectory()) {
Files.walkFileTree(file.toPath(), new SimpleFileVisitor<Path>() {
@Override
@@ -94,12 +96,12 @@ final class TemporaryFileStorage {
Files.delete(file.toPath());
}
}
}
catch (NoClassDefFoundError | IOException e) {
// Added NoClassDefFoundError cause sometimes it's visible in the builds
// this error is completely harmless
if (log.isTraceEnabled()) {
log.trace("Failed to remove temporary file", e);
catch (NoClassDefFoundError | IOException e) {
// Added NoClassDefFoundError cause sometimes it's visible in the builds
// this error is completely harmless
if (log.isTraceEnabled()) {
log.trace("Failed to remove temporary file", e);
}
}
}
}