summaryrefslogtreecommitdiffstats
path: root/config-proxy
diff options
context:
space:
mode:
authorgjoranv <gv@verizonmedia.com>2020-04-24 15:33:24 +0200
committergjoranv <gv@verizonmedia.com>2020-04-25 02:22:55 +0200
commit7786b391540a5632a17536e4b43ef635553db21a (patch)
tree8a56716e85a0cfaac7dc10c7dae20cd8f496e8ca /config-proxy
parent25f832e613bb6087327c293b527d5445babb4319 (diff)
LogLevel.SPAM -> Level.FINEST
Diffstat (limited to 'config-proxy')
-rw-r--r--config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ConfigProxyRpcServer.java10
-rw-r--r--config-proxy/src/main/java/com/yahoo/vespa/config/proxy/DelayedResponseHandler.java4
-rw-r--r--config-proxy/src/main/java/com/yahoo/vespa/config/proxy/RpcConfigSourceClient.java6
3 files changed, 10 insertions, 10 deletions
diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ConfigProxyRpcServer.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ConfigProxyRpcServer.java
index c8b16f5376a..1399c3677af 100644
--- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ConfigProxyRpcServer.java
+++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ConfigProxyRpcServer.java
@@ -247,10 +247,10 @@ public class ConfigProxyRpcServer implements Runnable, TargetWatcher, RpcServer
private void dispatchRpcRequest(Request request, Runnable handler) {
request.detach();
- log.log(LogLevel.SPAM, () -> String.format("Dispatching RPC request %s", requestLogId(request)));
+ log.log(Level.FINEST, () -> String.format("Dispatching RPC request %s", requestLogId(request)));
rpcExecutor.execute(() -> {
try {
- log.log(LogLevel.SPAM, () -> String.format("Executing RPC request %s.", requestLogId(request)));
+ log.log(Level.FINEST, () -> String.format("Executing RPC request %s.", requestLogId(request)));
handler.run();
} catch (Exception e) {
log.log(LogLevel.WARNING,
@@ -280,11 +280,11 @@ public class ConfigProxyRpcServer implements Runnable, TargetWatcher, RpcServer
try {
RawConfig config = proxyServer.resolveConfig(request);
if (config == null) {
- log.log(LogLevel.SPAM, () -> "No config received yet for " + request.getShortDescription() + ", not sending response");
+ log.log(Level.FINEST, () -> "No config received yet for " + request.getShortDescription() + ", not sending response");
} else if (ProxyServer.configOrGenerationHasChanged(config, request)) {
returnOkResponse(request, config);
} else {
- log.log(LogLevel.SPAM, "No new config for " + request.getShortDescription() + ", not sending response");
+ log.log(Level.FINEST, "No new config for " + request.getShortDescription() + ", not sending response");
}
} catch (Exception e) {
e.printStackTrace();
@@ -353,7 +353,7 @@ public class ConfigProxyRpcServer implements Runnable, TargetWatcher, RpcServer
request.addOkResponse(config.getPayload(), config.getGeneration(), config.isInternalRedeploy(), config.getConfigMd5());
log.log(Level.FINE, () -> "Return response: " + request.getShortDescription() + ",configMd5=" + config.getConfigMd5() +
",generation=" + config.getGeneration());
- log.log(LogLevel.SPAM, () -> "Config payload in response for " + request.getShortDescription() + ":" + config.getPayload());
+ log.log(Level.FINEST, () -> "Config payload in response for " + request.getShortDescription() + ":" + config.getPayload());
// TODO Catch exception for now, since the request might have been returned in CheckDelayedResponse
diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/DelayedResponseHandler.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/DelayedResponseHandler.java
index d9d2de2fac2..42bb2d21b55 100644
--- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/DelayedResponseHandler.java
+++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/DelayedResponseHandler.java
@@ -38,7 +38,7 @@ public class DelayedResponseHandler implements Runnable {
void checkDelayedResponses() {
try {
long start = System.currentTimeMillis();
- log.log(LogLevel.SPAM, () -> "Running DelayedResponseHandler. There are " + delayedResponses.size() +
+ log.log(Level.FINEST, () -> "Running DelayedResponseHandler. There are " + delayedResponses.size() +
" delayed responses. First one is " + delayedResponses.responses().peek());
DelayedResponse response;
AtomicInteger i = new AtomicInteger(0);
@@ -54,7 +54,7 @@ public class DelayedResponseHandler implements Runnable {
request.getConfigKey() + ", will retry");
}
}
- log.log(LogLevel.SPAM, () -> "Finished running DelayedResponseHandler. " + i.get() + " delayed responses sent in " +
+ log.log(Level.FINEST, () -> "Finished running DelayedResponseHandler. " + i.get() + " delayed responses sent in " +
(System.currentTimeMillis() - start) + " ms");
} catch (Exception e) { // To avoid thread throwing exception and executor never running this again
log.log(LogLevel.WARNING, "Got exception in DelayedResponseHandler: " + Exceptions.toMessageString(e));
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 d37408f97b3..31fd8a2682a 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
@@ -134,9 +134,9 @@ class RpcConfigSourceClient implements ConfigSourceClient {
if (cachedConfig != null) {
log.log(Level.FINE, () -> "Found config " + configCacheKey + " in cache, generation=" + cachedConfig.getGeneration() +
",configmd5=" + cachedConfig.getConfigMd5());
- log.log(LogLevel.SPAM, () -> "input config=" + input + ",cached config=" + cachedConfig);
+ log.log(Level.FINEST, () -> "input config=" + input + ",cached config=" + cachedConfig);
if (ProxyServer.configOrGenerationHasChanged(cachedConfig, request)) {
- log.log(LogLevel.SPAM, () -> "Cached config is not equal to requested, will return it");
+ log.log(Level.FINEST, () -> "Cached config is not equal to requested, will return it");
if (delayedResponses.remove(delayedResponse)) {
// unless another thread already did it
ret = cachedConfig;
@@ -217,7 +217,7 @@ class RpcConfigSourceClient implements ConfigSourceClient {
public void updateSubscribers(RawConfig config) {
log.log(Level.FINE, () -> "Config updated for " + config.getKey() + "," + config.getGeneration());
DelayQueue<DelayedResponse> responseDelayQueue = delayedResponses.responses();
- log.log(LogLevel.SPAM, () -> "Delayed response queue: " + responseDelayQueue);
+ log.log(Level.FINEST, () -> "Delayed response queue: " + responseDelayQueue);
if (responseDelayQueue.size() == 0) {
log.log(Level.FINE, () -> "There exists no matching element on delayed response queue for " + config.getKey());
return;