summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2018-03-16 09:36:41 +0100
committerGitHub <noreply@github.com>2018-03-16 09:36:41 +0100
commitbc608e7996edfa785145e1da3580f36684d6e410 (patch)
tree45987258c1f7f3ecade277ee50a25d108d0d502f
parentacb4db53e785e6073e80d33147ae3af6408d8e61 (diff)
parentae3de746e11b744987899328ae09292581a1bf7c (diff)
Merge pull request #5354 from vespa-engine/musum/log-adjustments
Minor adjustments to logging
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileServer.java9
1 files changed, 5 insertions, 4 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileServer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileServer.java
index ea3c9b97465..abcd3e13bfa 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileServer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileServer.java
@@ -89,11 +89,12 @@ public class FileServer {
public boolean hasFile(String fileName) {
return hasFile(new FileReference(fileName));
}
- public boolean hasFile(FileReference reference) {
+
+ private boolean hasFile(FileReference reference) {
try {
return root.getFile(reference).exists();
} catch (IllegalArgumentException e) {
- log.info("Failed locating file reference '" + reference + "' with error " + e.toString());
+ log.log(LogLevel.DEBUG, "Failed locating file reference '" + reference + "' with error " + e.toString());
}
return false;
}
@@ -122,9 +123,9 @@ public class FileServer {
try {
target.receive(fileData, new ReplayStatus(success ? 0 : 1, success ? "OK" : errorDescription));
- log.log(LogLevel.DEBUG, "Done serving reference '" + reference.toString() + "' with file '" + file.getAbsolutePath() + "'");
+ log.log(LogLevel.DEBUG, "Done serving file reference '" + reference.value() + "' with file '" + file.getAbsolutePath() + "'");
} catch (Exception e) {
- log.log(LogLevel.WARNING, "Failed serving file: " + Exceptions.toMessageString(e));
+ log.log(LogLevel.WARNING, "Failed serving file reference '" + reference.value() + "': " + Exceptions.toMessageString(e));
} finally {
fileData.close();
}