Only log the config on spam level.

Enusre we get everything useful on debug level.

2 files changed, 14 insertions, 13 deletions

diff --git a/config/src/main/java/com/yahoo/config/subscription/impl/JRTConfigRequester.java b/config/src/main/java/com/yahoo/config/subscription/impl/JRTConfigRequester.java
index d1b8e01678c..734935e0658 100644
--- a/config/src/main/java/com/yahoo/config/subscription/impl/JRTConfigRequester.java
+++ b/config/src/main/java/com/yahoo/config/subscription/impl/JRTConfigRequester.java
@@ -99,8 +99,9 @@ public class JRTConfigRequester implements RequestWaiter {
         // Add some time to the timeout, we never want it to time out in JRT during normal operation
         double jrtClientTimeout = getClientTimeout(timeout);
         if (log.isLoggable(LogLevel.DEBUG)) {
-            log.log(LogLevel.DEBUG, "Requesting config for " + sub + " on connection " + connection + " with RPC timeout " + jrtClientTimeout + ",defcontent=" +
-                    req.getDefContent().asString());
+            log.log(LogLevel.DEBUG, "Requesting config for " + sub + " on connection " + connection
+                    + " with RPC timeout " + jrtClientTimeout +
+                    (log.isLoggable(LogLevel.SPAM) ? (",defcontent=" + req.getDefContent().asString()) : ""));
         }
         connection.invokeAsync(req.getRequest(), jrtClientTimeout, this);
     }
@@ -126,17 +127,17 @@ public class JRTConfigRequester implements RequestWaiter {
     }
 
     private void doHandle(JRTConfigSubscription<ConfigInstance> sub, JRTClientConfigRequest jrtReq, Connection connection) {
-        if (sub.getState() == ConfigSubscription.State.CLOSED) return; // Avoid error messages etc. after closing
         boolean validResponse = jrtReq.validateResponse();
+        if (log.isLoggable(LogLevel.DEBUG)) {
+            log.log(LogLevel.DEBUG, "Request callback " +(validResponse ? "valid" : "invalid") + ". Req: " + jrtReq + "\nSpec: " + connection);
+        }
+        if (sub.getState() == ConfigSubscription.State.CLOSED) return; // Avoid error messages etc. after closing
         Trace trace = jrtReq.getResponseTrace();
         trace.trace(TRACELEVEL, "JRTConfigRequester.doHandle()");
-        if (log.isLoggable(LogLevel.DEBUG)) {
-            log.log(LogLevel.DEBUG, trace.toString());
+        if (log.isLoggable(LogLevel.SPAM)) {
+            log.log(LogLevel.SPAM, trace.toString());
         }
         if (validResponse) {
-            if (log.isLoggable(LogLevel.DEBUG)) {
-                log.log(LogLevel.DEBUG, "Request callback, OK. Req: " + jrtReq + "\nSpec: " + connection);
-            }
             handleOKRequest(jrtReq, sub, connection);
         } else {
             logWhenErrorResponse(jrtReq, connection);
@@ -257,9 +258,7 @@ public class JRTConfigRequester implements RequestWaiter {
             }
         }
         if (sub.getState() != ConfigSubscription.State.OPEN) return;
-        scheduleNextRequest(jrtReq, sub,
-                calculateSuccessDelay(),
-                calculateSuccessTimeout());
+        scheduleNextRequest(jrtReq, sub, calculateSuccessDelay(), calculateSuccessTimeout());
     }
 
     private long calculateSuccessTimeout() {
diff --git a/config/src/main/java/com/yahoo/vespa/config/protocol/SlimeClientConfigRequest.java b/config/src/main/java/com/yahoo/vespa/config/protocol/SlimeClientConfigRequest.java
index 386757d2afc..584ab1414aa 100644
--- a/config/src/main/java/com/yahoo/vespa/config/protocol/SlimeClientConfigRequest.java
+++ b/config/src/main/java/com/yahoo/vespa/config/protocol/SlimeClientConfigRequest.java
@@ -1,8 +1,10 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.config.protocol;
 
-import com.yahoo.jrt.*;
-import com.yahoo.slime.*;
+import com.yahoo.jrt.Request;
+import com.yahoo.jrt.StringValue;
+import com.yahoo.slime.JsonFormat;
+import com.yahoo.slime.Slime;
 import com.yahoo.text.Utf8;
 import com.yahoo.vespa.config.ConfigKey;
 import com.yahoo.vespa.config.util.ConfigUtils;