diff options
author | Harald Musum <musum@yahooinc.com> | 2021-11-28 18:32:49 +0100 |
---|---|---|
committer | Harald Musum <musum@yahooinc.com> | 2021-11-28 18:32:49 +0100 |
commit | b00e539c2995b4ed150621237b86d2bc5c33aecf (patch) | |
tree | 985ff4718d7682f9a2241d3ab9319dbc69950741 /filedistribution | |
parent | 434fd1cdb6dee96513779a4a2a6719e9bb4c8b62 (diff) |
M0;95;0cove logging in getFile() to callers
Diffstat (limited to 'filedistribution')
-rw-r--r-- | filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileDownloader.java | 7 | ||||
-rw-r--r-- | filedistribution/src/test/java/com/yahoo/vespa/filedistribution/FileDownloaderTest.java | 2 |
2 files changed, 1 insertions, 8 deletions
diff --git a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileDownloader.java b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileDownloader.java index b2efd35e41e..1821c8971e7 100644 --- a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileDownloader.java +++ b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileDownloader.java @@ -6,7 +6,6 @@ import com.yahoo.jrt.Supervisor; import com.yahoo.vespa.config.Connection; import com.yahoo.vespa.config.ConnectionPool; import com.yahoo.vespa.defaults.Defaults; -import com.yahoo.yolean.Exceptions; import java.io.File; import java.time.Duration; @@ -69,16 +68,10 @@ public class FileDownloader implements AutoCloseable { downloadDirectory); } - public Optional<File> getFile(FileReference fileReference, String client) { - return getFile(new FileReferenceDownload(fileReference, client)); - } - public Optional<File> getFile(FileReferenceDownload fileReferenceDownload) { try { return getFutureFile(fileReferenceDownload).get(timeout.toMillis(), TimeUnit.MILLISECONDS); } catch (InterruptedException | ExecutionException | TimeoutException e) { - log.log(Level.WARNING, "Failed downloading '" + fileReferenceDownload + - "', removing from download queue: " + Exceptions.toMessageString(e)); fileReferenceDownloader.failedDownloading(fileReferenceDownload.fileReference()); return Optional.empty(); } diff --git a/filedistribution/src/test/java/com/yahoo/vespa/filedistribution/FileDownloaderTest.java b/filedistribution/src/test/java/com/yahoo/vespa/filedistribution/FileDownloaderTest.java index 460a1ee593a..3655285efbe 100644 --- a/filedistribution/src/test/java/com/yahoo/vespa/filedistribution/FileDownloaderTest.java +++ b/filedistribution/src/test/java/com/yahoo/vespa/filedistribution/FileDownloaderTest.java @@ -297,7 +297,7 @@ public class FileDownloaderTest { } private Optional<File> getFile(FileReference fileReference) { - return fileDownloader.getFile(fileReference, "test"); + return fileDownloader.getFile(new FileReferenceDownload(fileReference, "test")); } private static class MockConnection implements ConnectionPool, com.yahoo.vespa.config.Connection { |