Merge pull request #20258 from vespa-engine/hmusum/move-logging-to-callers

Move logging in getFile() to callers

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 {