summaryrefslogtreecommitdiffstats
path: root/config-proxy
diff options
context:
space:
mode:
authorgjoranv <gv@verizonmedia.com>2020-04-24 15:37:33 +0200
committergjoranv <gv@verizonmedia.com>2020-04-25 02:22:55 +0200
commit816e0e5dcd0987e8be4e3ea66402c83b770dd467 (patch)
tree8d9d57215e9546ec001e40827dfdb57fcb652596 /config-proxy
parent7786b391540a5632a17536e4b43ef635553db21a (diff)
LogLevel.INFO -> Level.INFO
Diffstat (limited to 'config-proxy')
-rw-r--r--config-proxy/src/main/java/com/yahoo/vespa/config/proxy/MemoryCache.java6
-rw-r--r--config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ProxyServer.java2
-rw-r--r--config-proxy/src/main/java/com/yahoo/vespa/config/proxy/RpcConfigSourceClient.java8
-rw-r--r--config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/CachedFilesMaintainer.java2
-rw-r--r--config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/FileDistributionRpcServer.java2
-rw-r--r--config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/UrlDownloadRpcServer.java6
6 files changed, 13 insertions, 13 deletions
diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/MemoryCache.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/MemoryCache.java
index 50f8ad26bf0..c7a79cc8d14 100644
--- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/MemoryCache.java
+++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/MemoryCache.java
@@ -78,7 +78,7 @@ public class MemoryCache {
String dumpCacheToDisk(String path, MemoryCache cache) {
if (path == null || path.isEmpty()) {
path = DEFAULT_DUMP_DIR;
- log.log(LogLevel.INFO, "dumpCache. No path or empty path. Using '" + path + "'");
+ log.log(Level.INFO, "dumpCache. No path or empty path. Using '" + path + "'");
}
if (path.endsWith("/")) {
path = path.substring(0, path.length() - 1);
@@ -86,7 +86,7 @@ public class MemoryCache {
File dir = new File(path);
if ( ! dir.exists()) {
- log.log(LogLevel.INFO, dir.getAbsolutePath() + " does not exist, creating it");
+ log.log(Level.INFO, dir.getAbsolutePath() + " does not exist, creating it");
try {
Files.createDirectory(dir.toPath());
} catch (IOException e) {
@@ -101,7 +101,7 @@ public class MemoryCache {
return "Not able to write to '" + dir.getAbsolutePath() + "'";
}
- log.log(LogLevel.INFO, "Dumping cache to '" + dir.getAbsolutePath() + "'");
+ log.log(Level.INFO, "Dumping cache to '" + dir.getAbsolutePath() + "'");
for (RawConfig config : cache.values()) {
writeConfigToFile(config, path);
}
diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ProxyServer.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ProxyServer.java
index 1ebf3106a94..4606ec7c072 100644
--- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ProxyServer.java
+++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ProxyServer.java
@@ -99,7 +99,7 @@ public class ProxyServer implements Runnable {
default:
throw new IllegalArgumentException("Cannot set invalid mode '" + modeName + "'");
}
- log.log(LogLevel.INFO, "Switched from '" + oldMode.name().toLowerCase() + "' mode to '" + getMode().name().toLowerCase() + "' mode");
+ log.log(Level.INFO, "Switched from '" + oldMode.name().toLowerCase() + "' mode to '" + getMode().name().toLowerCase() + "' mode");
}
private ConfigProxyRpcServer createRpcServer(Spec spec) {
diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/RpcConfigSourceClient.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/RpcConfigSourceClient.java
index 31fd8a2682a..25961caf85b 100644
--- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/RpcConfigSourceClient.java
+++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/RpcConfigSourceClient.java
@@ -95,12 +95,12 @@ class RpcConfigSourceClient implements ConfigSourceClient {
log.log(Level.FINE, () -> "Created connection to config source at " + spec.toString());
return;
} else {
- log.log(LogLevel.INFO, "Could not connect to config source at " + spec.toString());
+ log.log(Level.INFO, "Could not connect to config source at " + spec.toString());
}
target.close();
}
String extra = "";
- log.log(LogLevel.INFO, "Could not connect to any config source in set " + configSourceSet.toString() +
+ log.log(Level.INFO, "Could not connect to any config source in set " + configSourceSet.toString() +
", please make sure config server(s) are running. " + extra);
}
}
@@ -165,7 +165,7 @@ class RpcConfigSourceClient implements ConfigSourceClient {
activeSubscribers.put(configCacheKey, subscriber);
exec.execute(subscriber);
} catch (ConfigurationRuntimeException e) {
- log.log(LogLevel.INFO, "Subscribe for '" + configCacheKey + "' failed, closing subscriber");
+ log.log(Level.INFO, "Subscribe for '" + configCacheKey + "' failed, closing subscriber");
subscriber.cancel();
}
}
@@ -235,7 +235,7 @@ class RpcConfigSourceClient implements ConfigSourceClient {
log.log(Level.FINE, () -> "Call returnOkResponse for " + config.getKey() + "," + config.getGeneration());
rpcServer.returnOkResponse(request, config);
} else {
- log.log(LogLevel.INFO, "Could not remove " + config.getKey() + " from delayedResponses queue, already removed");
+ log.log(Level.INFO, "Could not remove " + config.getKey() + " from delayedResponses queue, already removed");
}
}
}
diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/CachedFilesMaintainer.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/CachedFilesMaintainer.java
index 146a5e644ef..ffe7f7bec46 100644
--- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/CachedFilesMaintainer.java
+++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/CachedFilesMaintainer.java
@@ -70,7 +70,7 @@ class CachedFilesMaintainer implements Runnable {
.filter(fileReference -> isFileLastModifiedBefore(new File(directory, fileReference), deleteNotUsedSinceInstant))
.collect(Collectors.toSet());
if (filesToDelete.size() > 0) {
- log.log(LogLevel.INFO, "Files that can be deleted in " + directory + " (not used since " + deleteNotUsedSinceInstant + "): " + filesToDelete);
+ log.log(Level.INFO, "Files that can be deleted in " + directory + " (not used since " + deleteNotUsedSinceInstant + "): " + filesToDelete);
filesToDelete.forEach(fileReference -> {
File file = new File(directory, fileReference);
if (!IOUtils.recursiveDeleteDir(file))
diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/FileDistributionRpcServer.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/FileDistributionRpcServer.java
index 3b8a882963c..a25e86926a1 100644
--- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/FileDistributionRpcServer.java
+++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/FileDistributionRpcServer.java
@@ -122,7 +122,7 @@ class FileDistributionRpcServer {
req.returnValues().add(new StringValue(file.get().getAbsolutePath()));
log.log(Level.FINE, () -> "File reference '" + fileReference.value() + "' available at " + file.get());
} else {
- log.log(LogLevel.INFO, "File reference '" + fileReference.value() + "' not found, returning error");
+ log.log(Level.INFO, "File reference '" + fileReference.value() + "' not found, returning error");
req.setError(fileReferenceDoesNotExists, "File reference '" + fileReference.value() + "' not found");
}
diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/UrlDownloadRpcServer.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/UrlDownloadRpcServer.java
index 74393ca07f9..21baf873f6d 100644
--- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/UrlDownloadRpcServer.java
+++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/UrlDownloadRpcServer.java
@@ -79,11 +79,11 @@ class UrlDownloadRpcServer {
setIfModifiedSince(connection, downloadDir); // don't download if we already have the file
if (connection.getResponseCode() == 200) {
- log.log(LogLevel.INFO, "Downloading URL '" + url + "'");
+ log.log(Level.INFO, "Downloading URL '" + url + "'");
downloadFile(req, connection, downloadDir);
} else if (connection.getResponseCode() == 304) {
- log.log(LogLevel.INFO, "URL '" + url + "' already downloaded (server response: 304)");
+ log.log(Level.INFO, "URL '" + url + "' already downloaded (server response: 304)");
req.returnValues().add(new StringValue(new File(downloadDir, CONTENTS_FILE_NAME).getAbsolutePath()));
} else {
@@ -112,7 +112,7 @@ class UrlDownloadRpcServer {
new RequestTracker().trackRequest(downloadDir);
req.returnValues().add(new StringValue(contentsPath.getAbsolutePath()));
log.log(Level.FINE, () -> "URL '" + url + "' available at " + contentsPath);
- log.log(LogLevel.INFO, String.format("Download of URL '%s' done in %.3f seconds",
+ log.log(Level.INFO, String.format("Download of URL '%s' done in %.3f seconds",
url, (System.currentTimeMillis() -start) / 1000.0));
} else {
log.log(LogLevel.ERROR, "Downloaded URL '" + url + "' not found, returning error");