Logging cleanup

1 files changed, 14 insertions, 32 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java
index dd328c9a730..78a8cda7c34 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java
@@ -44,6 +44,7 @@ import com.yahoo.vespa.filedistribution.FileDownloader;
 import com.yahoo.vespa.filedistribution.FileReceiver;
 import com.yahoo.vespa.filedistribution.FileReferenceData;
 import com.yahoo.vespa.filedistribution.FileReferenceDownload;
+
 import java.nio.ByteBuffer;
 import java.time.Duration;
 import java.util.Arrays;
@@ -61,12 +62,13 @@ import java.util.concurrent.RejectedExecutionException;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import static com.yahoo.vespa.filedistribution.FileReferenceData.CompressionType;
+import static java.util.logging.Level.FINE;
+import static java.util.logging.Level.WARNING;
 
 /**
  * An RPC server class that handles the config protocol RPC method "getConfigV3".
@@ -77,8 +79,6 @@ import static com.yahoo.vespa.filedistribution.FileReferenceData.CompressionType
 // TODO: Split business logic out of this
 public class RpcServer implements Runnable, ConfigActivationListener, TenantListener {
 
-    static final String getConfigMethodName = "getConfigV3";
-    
     private static final int TRACELEVEL = 6;
     static final int TRACELEVEL_DEBUG = 9;
     private static final String THREADPOOL_NAME = "rpcserver worker pool";
@@ -158,9 +158,6 @@ public class RpcServer implements Runnable, ConfigActivationListener, TenantList
      * Uses the template pattern to call methods in classes that extend RpcServer.
      */
     private void getConfigV3(Request req) {
-        if (log.isLoggable(Level.FINEST)) {
-            log.log(Level.FINEST, getConfigMethodName);
-        }
         req.detach();
         rpcAuthorizer.authorizeConfigRequest(req)
                 .thenRun(() -> addToRequestQueue(JRTServerConfigRequestV3.createFromRequest(req)));
@@ -184,7 +181,7 @@ public class RpcServer implements Runnable, ConfigActivationListener, TenantList
 
     @Override
     public void run() {
-        log.log(Level.FINE, "Rpc server will listen on port " + spec.port());
+        log.log(FINE, "Rpc server will listen on port " + spec.port());
         try {
             Acceptor acceptor = supervisor.listen(spec);
             isRunning = true;
@@ -276,9 +273,7 @@ public class RpcServer implements Runnable, ConfigActivationListener, TenantList
     void configActivated(ApplicationId applicationId) {
         List<DelayedConfigResponses.DelayedConfigResponse> responses = delayedConfigResponses.drainQueue(applicationId);
         String logPre = TenantRepository.logPre(applicationId);
-        if (log.isLoggable(Level.FINE)) {
-            log.log(Level.FINE, logPre + "Start of configActivated: " + responses.size() + " requests on delayed requests queue");
-        }
+        log.log(FINE, () -> logPre + "Start of configActivated: " + responses.size() + " requests on delayed requests queue");
         int responsesSent = 0;
         CompletionService<Boolean> completionService = new ExecutorCompletionService<>(executorService);
         while (!responses.isEmpty()) {
@@ -287,15 +282,13 @@ public class RpcServer implements Runnable, ConfigActivationListener, TenantList
             // Doing cancel here deals with the case where the timer is already running or has not run, so
             // there is no need for any extra check.
             if (delayedConfigResponse.cancel()) {
-                if (log.isLoggable(Level.FINE)) {
-                    logRequestDebug(Level.FINE, logPre + "Timer cancelled for ", delayedConfigResponse.request);
-                }
+                log.log(FINE, () -> logPre + "Timer cancelled for " + delayedConfigResponse.request);
                 // Do not wait for this request if we were unable to execute
                 if (addToRequestQueue(delayedConfigResponse.request, false, completionService)) {
                     responsesSent++;
                 }
             } else {
-                log.log(Level.FINE, () -> logPre + "Timer already cancelled or finished or never scheduled");
+                log.log(FINE, () -> logPre + "Timer already cancelled or finished or never scheduled");
             }
         }
 
@@ -306,15 +299,6 @@ public class RpcServer implements Runnable, ConfigActivationListener, TenantList
                 Thread.currentThread().interrupt();
             }
         }
-
-        if (log.isLoggable(Level.FINE))
-            log.log(Level.FINE, logPre + "Finished activating " + responsesSent + " requests");
-    }
-
-    private void logRequestDebug(Level level, String message, JRTServerConfigRequest request) {
-        if (log.isLoggable(level)) {
-            log.log(level, message + request.getShortDescription());
-        }
     }
 
     @Override
@@ -325,9 +309,7 @@ public class RpcServer implements Runnable, ConfigActivationListener, TenantList
     }
 
     public void respond(JRTServerConfigRequest request) {
-        if (log.isLoggable(Level.FINE)) {
-            log.log(Level.FINE, "Trace at request return:\n" + request.getRequestTrace().toString());
-        }
+        log.log(FINE, () -> "Trace when responding:\n" + request.getRequestTrace().toString());
         request.getRequest().returnRequest();
     }
 
@@ -344,7 +326,7 @@ public class RpcServer implements Runnable, ConfigActivationListener, TenantList
             if (GetConfigProcessor.logDebug(trace)) {
                 String message = "Did not find tenant for host '" + hostname + "', using " + TenantName.defaultName() +
                                  ". Hosts in host registry: " + hostRegistry.getAllHosts();
-                log.log(Level.FINE, () -> message);
+                log.log(FINE, () -> message);
                 trace.trace(6, message);
             }
             return Optional.empty();
@@ -368,7 +350,6 @@ public class RpcServer implements Runnable, ConfigActivationListener, TenantList
     public Boolean addToRequestQueue(JRTServerConfigRequest request, boolean forceResponse, CompletionService<Boolean> completionService) {
         // It's no longer delayed if we get here
         request.setDelayedResponse(false);
-        //ConfigDebug.logDebug(log, System.currentTimeMillis(), request.getConfigKey(), "RpcServer.addToRequestQueue()");
         try {
             final GetConfigProcessor task = new GetConfigProcessor(this, request, forceResponse);
             if (completionService == null) {
@@ -405,7 +386,7 @@ public class RpcServer implements Runnable, ConfigActivationListener, TenantList
                          "'. Request from host '" + request.getClientHostName() + "'";
             metrics.incUnknownHostRequests();
             trace.trace(TRACELEVEL, msg);
-            log.log(Level.WARNING, msg);
+            log.log(WARNING, msg);
             return GetConfigContext.empty();
         }
         RequestHandler handler = requestHandler.get();
@@ -430,7 +411,7 @@ public class RpcServer implements Runnable, ConfigActivationListener, TenantList
 
     @Override
     public void onTenantDelete(TenantName tenant) {
-        log.log(Level.FINE, () -> TenantRepository.logPre(tenant) +
+        log.log(FINE, () -> TenantRepository.logPre(tenant) +
                             "Tenant deleted, removing request handler and cleaning host registry");
         tenants.remove(tenant);
     }
@@ -500,7 +481,8 @@ public class RpcServer implements Runnable, ConfigActivationListener, TenantList
             Request request = createMetaRequest(fileData);
             invokeRpcIfValidConnection(request);
             if (request.isError()) {
-                log.warning("Failed delivering meta for reference '" + fileData.fileReference().value() + "' with file '" + fileData.filename() + "' to " +
+                log.log(WARNING, () -> "Failed delivering meta for reference '" + fileData.fileReference().value() +
+                        "' with file '" + fileData.filename() + "' to " +
                         target.toString() + " with error: '" + request.errorMessage() + "'.");
                 return 1;
             } else {
@@ -519,6 +501,7 @@ public class RpcServer implements Runnable, ConfigActivationListener, TenantList
             request.parameters().add(new StringValue(fileData.type().name()));
             request.parameters().add(new Int64Value(fileData.size()));
             // Only add parameter if not gzip, this is default and old clients will not handle the extra parameter
+            // TODO Always add parameter in Vespa 9
             if (fileData.compressionType() != CompressionType.gzip)
                 request.parameters().add(new StringValue(fileData.compressionType().name()));
             return request;
@@ -584,7 +567,6 @@ public class RpcServer implements Runnable, ConfigActivationListener, TenantList
                         acceptedCompressionTypes = Arrays.stream(request.parameters().get(2).asStringArray())
                                                          .map(CompressionType::valueOf)
                                                          .collect(Collectors.toSet());
-                    log.log(Level.FINE, "acceptedCompressionTypes=" + acceptedCompressionTypes);
 
                     fileServer.serveFile(reference, downloadFromOtherSourceIfNotFound, acceptedCompressionTypes, request, receiver);
                 });