Remove or simplify some logging

3 files changed, 5 insertions, 24 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java
index 28487106268..57bf88d8aad 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java
@@ -27,13 +27,11 @@ import com.yahoo.vespa.curator.CompletionTimeoutException;
 import com.yahoo.vespa.curator.Curator;
 import com.yahoo.vespa.curator.Lock;
 import com.yahoo.vespa.curator.transaction.CuratorTransaction;
-import com.yahoo.vespa.flags.FetchVector;
 import com.yahoo.vespa.flags.FlagSource;
 import com.yahoo.vespa.flags.ListFlag;
 import com.yahoo.vespa.flags.PermanentFlags;
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.curator.framework.recipes.cache.PathChildrenCacheEvent;
-
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.time.Clock;
@@ -213,8 +211,7 @@ public class TenantApplications implements RequestHandler, HostValidator<Applica
     @Override
     public ConfigResponse resolveConfig(ApplicationId appId, GetConfigRequest req, Optional<Version> vespaVersion) {
         Application application = getApplication(appId, vespaVersion);
-        log.log(Level.FINE, () -> TenantRepository.logPre(appId) + "Resolving for tenant '" + tenant +
-                                  "' with handler for application '" + application + "'");
+        log.log(Level.FINE, () -> TenantRepository.logPre(appId) + "Resolving config");
         return application.resolveConfig(req, responseFactory);
     }
 
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/GetConfigProcessor.java b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/GetConfigProcessor.java
index 3cc1993d09e..ae8d418a2fa 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/GetConfigProcessor.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/GetConfigProcessor.java
@@ -83,9 +83,7 @@ class GetConfigProcessor implements Runnable {
             return null;
         }
         Trace trace = request.getRequestTrace();
-        if (logDebug(trace)) {
-            debugLog(trace, "GetConfigProcessor.run() on " + localHostName);
-        }
+        debugLog(trace, "GetConfigProcessor.run() on " + localHostName);
 
         Optional<TenantName> tenant = rpcServer.resolveTenant(request, trace);
 
@@ -106,9 +104,7 @@ class GetConfigProcessor implements Runnable {
         Optional<Version> vespaVersion = rpcServer.useRequestVersion() ?
                 request.getVespaVersion().map(VespaVersion::toString).map(Version::fromString) :
                 Optional.empty();
-        if (logDebug(trace)) {
-            debugLog(trace, "Using version " + printableVespaVersion(vespaVersion));
-        }
+        debugLog(trace, "Using version " + printableVespaVersion(vespaVersion));
 
         if ( ! context.requestHandler().hasApplication(context.applicationId(), vespaVersion)) {
             handleError(request, ErrorCode.UNKNOWN_VESPA_VERSION, "Unknown Vespa version in request: " + printableVespaVersion(vespaVersion));
@@ -143,14 +139,10 @@ class GetConfigProcessor implements Runnable {
 
             // debugLog(trace, "config response before encoding:" + config.toString());
             request.addOkResponse(request.payloadFromResponse(config), config.getGeneration(), config.applyOnRestart(), config.getPayloadChecksums());
-            if (logDebug(trace)) {
-                debugLog(trace, "return response: " + request.getShortDescription());
-            }
+            debugLog(trace, "return response: " + request.getShortDescription());
             respond(request);
         } else {
-            if (logDebug(trace)) {
-                debugLog(trace, "delaying response " + request.getShortDescription());
-            }
+            debugLog(trace, "delaying response " + request.getShortDescription());
             return new Pair<>(context, config != null ? config.getGeneration() : 0);
         }
         return null;
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionStateWatcher.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionStateWatcher.java
index abd2266fcf3..efe1ecd0e7f 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionStateWatcher.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionStateWatcher.java
@@ -82,15 +82,7 @@ public class SessionStateWatcher {
                 ChildData node = fileCache.getCurrentData();
                 if (node != null) {
                     newStatus = Status.parse(Utf8.toString(node.getData()));
-
-                    String debugMessage = log.isLoggable(Level.FINE)
-                            ? "Session " + sessionId + " changed status to " + newStatus.name()
-                            : null;
-                    if (debugMessage != null) log.fine(debugMessage);
-
                     sessionStatusChanged(newStatus);
-
-                    if (debugMessage != null) log.fine(debugMessage + ": Done");
                 }
             } catch (Exception e) {
                 log.log(Level.WARNING, "Error handling session change to " + newStatus.name() + " for session " + getSessionId(), e);