Changed PrefixLogger constructor to take in Class instead of String as logger name

9 files changed, 25 insertions, 26 deletions

diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerImpl.java
index 8148c1ad13e..e286dff43ca 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerImpl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerImpl.java
@@ -58,7 +58,7 @@ import java.util.stream.Stream;
  * @author stiankri
  */
 public class DockerImpl implements Docker {
-    private static final PrefixLogger NODE_ADMIN_LOGGER = PrefixLogger.getNodeAdminLogger(DockerImpl.class.getName());
+    private static final PrefixLogger NODE_ADMIN_LOGGER = PrefixLogger.getNodeAdminLogger(DockerImpl.class);
 
     private static final int SECONDS_TO_WAIT_BEFORE_KILLING = 10;
     private static final String FRAMEWORK_CONTAINER_PREFIX = "/";
@@ -281,7 +281,7 @@ public class DockerImpl implements Docker {
     private void setupContainerNetworking(ContainerName containerName,
                                           HostName hostName,
                                           int containerPid) throws UnknownHostException {
-        PrefixLogger logger = PrefixLogger.getNodeAgentLogger(DockerImpl.class.getName(), containerName);
+        PrefixLogger logger = PrefixLogger.getNodeAgentLogger(DockerImpl.class, containerName);
         InetAddress inetAddress = InetAddress.getByName(hostName.s());
         String ipAddress = inetAddress.getHostAddress();
 
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/MaintenanceSchedulerImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/MaintenanceSchedulerImpl.java
index dd5d2c5a411..b8f76632202 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/MaintenanceSchedulerImpl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/MaintenanceSchedulerImpl.java
@@ -19,13 +19,13 @@ import java.util.logging.Level;
  * @author valerijf
  */
 public class MaintenanceSchedulerImpl implements MaintenanceScheduler {
-    private static final PrefixLogger NODE_ADMIN_LOGGER = PrefixLogger.getNodeAdminLogger(MaintenanceSchedulerImpl.class.getName());
+    private static final PrefixLogger NODE_ADMIN_LOGGER = PrefixLogger.getNodeAdminLogger(MaintenanceSchedulerImpl.class);
 
     private static final String[] baseArguments = {"sudo", "/home/y/libexec/vespa/node-admin/maintenance.sh"};
 
     @Override
     public void removeOldFilesFromNode(ContainerName containerName) {
-        PrefixLogger logger = PrefixLogger.getNodeAgentLogger(MaintenanceSchedulerImpl.class.getName(), containerName);
+        PrefixLogger logger = PrefixLogger.getNodeAgentLogger(MaintenanceSchedulerImpl.class, containerName);
 
         String[] pathsToClean = {"/home/y/logs/elasticsearch2", "/home/y/logs/logstash2",
                 "/home/y/logs/daemontools_y", "/home/y/logs/nginx", "/home/y/logs/vespa"};
@@ -58,7 +58,7 @@ public class MaintenanceSchedulerImpl implements MaintenanceScheduler {
 
     @Override
     public void deleteContainerStorage(ContainerName containerName) throws IOException {
-        PrefixLogger logger = PrefixLogger.getNodeAgentLogger(MaintenanceSchedulerImpl.class.getName(), containerName);
+        PrefixLogger logger = PrefixLogger.getNodeAgentLogger(MaintenanceSchedulerImpl.class, containerName);
 
         File yVarDir = Maintainer.pathInNodeAdminFromPathInNode(containerName, "/home/y/var").toFile();
         if (yVarDir.exists()) {
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImpl.java
index 93ce96fecbd..6d941f0be52 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImpl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImpl.java
@@ -33,7 +33,7 @@ import java.util.stream.Stream;
  * @author stiankri
  */
 public class NodeAdminImpl implements NodeAdmin {
-    private static final PrefixLogger logger = PrefixLogger.getNodeAdminLogger(NodeAdmin.class.getName());
+    private static final PrefixLogger logger = PrefixLogger.getNodeAdminLogger(NodeAdmin.class);
 
     private static final long MIN_AGE_IMAGE_GC_MILLIS = Duration.ofMinutes(15).toMillis();
 
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdater.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdater.java
index b6e2cc741ba..4b7ba4fc540 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdater.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminStateUpdater.java
@@ -29,7 +29,7 @@ import static java.util.concurrent.TimeUnit.MILLISECONDS;
  * @author dybis, stiankri
  */
 public class NodeAdminStateUpdater extends AbstractComponent {
-    private final PrefixLogger logger = PrefixLogger.getNodeAdminLogger(NodeAdminStateUpdater.class.getName());
+    private final PrefixLogger logger = PrefixLogger.getNodeAdminLogger(NodeAdminStateUpdater.class);
     private final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1);
 
     private final NodeAdmin nodeAdmin;
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/DockerOperations.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/DockerOperations.java
index f02c8503038..c2e9f3cc14a 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/DockerOperations.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/DockerOperations.java
@@ -42,7 +42,7 @@ public class DockerOperations {
         try {
             return docker.getVespaVersion(containerName);
         } catch (RuntimeException e) {
-            PrefixLogger logger = PrefixLogger.getNodeAgentLogger(DockerOperations.class.getName(), containerName);
+            PrefixLogger logger = PrefixLogger.getNodeAgentLogger(DockerOperations.class, containerName);
             logger.log(Level.WARNING, "Ignoring failure", e);
             return null;
         }
@@ -72,7 +72,7 @@ public class DockerOperations {
         }
         Optional<String> removeReason = shouldRemoveContainer(nodeSpec, existingContainer);
         if (removeReason.isPresent()) {
-            PrefixLogger logger = PrefixLogger.getNodeAgentLogger(DockerOperations.class.getName(), nodeSpec.containerName);
+            PrefixLogger logger = PrefixLogger.getNodeAgentLogger(DockerOperations.class, nodeSpec.containerName);
             logger.log(LogLevel.INFO, "Will remove container " + existingContainer.get() + ": " + removeReason.get());
             removeContainer(nodeSpec, existingContainer.get(), orchestrator);
             return true;
@@ -124,7 +124,7 @@ public class DockerOperations {
      * Any failures are logged and ignored.
      */
     private void trySuspendNode(ContainerName containerName) {
-        PrefixLogger logger = PrefixLogger.getNodeAgentLogger(DockerOperations.class.getName(), containerName);
+        PrefixLogger logger = PrefixLogger.getNodeAgentLogger(DockerOperations.class, containerName);
         Optional<ProcessResult> result;
 
         try {
@@ -145,7 +145,7 @@ public class DockerOperations {
     }
 
     void startContainer(final ContainerNodeSpec nodeSpec) {
-        PrefixLogger logger = PrefixLogger.getNodeAgentLogger(DockerOperations.class.getName(), nodeSpec.containerName);
+        PrefixLogger logger = PrefixLogger.getNodeAgentLogger(DockerOperations.class, nodeSpec.containerName);
 
         logger.log(Level.INFO, "Starting container " + nodeSpec.containerName);
         // TODO: Properly handle absent min* values
@@ -159,7 +159,7 @@ public class DockerOperations {
     }
 
     void scheduleDownloadOfImage(final ContainerNodeSpec nodeSpec, Runnable callback) {
-        PrefixLogger logger = PrefixLogger.getNodeAgentLogger(DockerOperations.class.getName(), nodeSpec.containerName);
+        PrefixLogger logger = PrefixLogger.getNodeAgentLogger(DockerOperations.class, nodeSpec.containerName);
 
         logger.log(LogLevel.INFO, "Schedule async download of Docker image " + nodeSpec.wantedDockerImage.get());
         final CompletableFuture<DockerImage> asyncPullResult = docker.pullImageAsync(nodeSpec.wantedDockerImage.get());
@@ -177,7 +177,7 @@ public class DockerOperations {
 
     private void removeContainer(final ContainerNodeSpec nodeSpec, final Container existingContainer, Orchestrator orchestrator)
             throws Exception {
-        PrefixLogger logger = PrefixLogger.getNodeAgentLogger(DockerOperations.class.getName(), nodeSpec.containerName);
+        PrefixLogger logger = PrefixLogger.getNodeAgentLogger(DockerOperations.class, nodeSpec.containerName);
         final ContainerName containerName = existingContainer.name;
         if (existingContainer.isRunning) {
             // If we're stopping the node only to upgrade or restart the node or similar, we need to suspend
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java
index 3f4f91c2df0..ca2feb4b1a5 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java
@@ -80,7 +80,7 @@ public class NodeAgentImpl implements NodeAgent {
         this.hostname = hostName;
         this.dockerOperations = dockerOperations;
         this.maintenanceScheduler = maintenanceScheduler;
-        this.logger = PrefixLogger.getNodeAgentLogger(NodeAgentImpl.class.getName(),
+        this.logger = PrefixLogger.getNodeAgentLogger(NodeAgentImpl.class,
                 NodeRepositoryImpl.containerNameFromHostName(hostName.toString()));
     }
 
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/noderepository/NodeRepositoryImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/noderepository/NodeRepositoryImpl.java
index e7e2168a8be..c2c95e7260a 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/noderepository/NodeRepositoryImpl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/noderepository/NodeRepositoryImpl.java
@@ -6,7 +6,6 @@ import com.yahoo.vespa.applicationmodel.HostName;
 import com.yahoo.vespa.hosted.node.admin.ContainerNodeSpec;
 import com.yahoo.vespa.hosted.node.admin.docker.ContainerName;
 import com.yahoo.vespa.hosted.node.admin.docker.DockerImage;
-import com.yahoo.vespa.hosted.node.admin.nodeagent.DockerOperations;
 import com.yahoo.vespa.hosted.node.admin.noderepository.bindings.GetNodesResponse;
 import com.yahoo.vespa.hosted.node.admin.noderepository.bindings.NodeRepositoryApi;
 import com.yahoo.vespa.hosted.node.admin.noderepository.bindings.UpdateNodeAttributesRequestBody;
@@ -29,7 +28,7 @@ import java.util.Set;
  * @author stiankri
  */
 public class NodeRepositoryImpl implements NodeRepository {
-    private static final PrefixLogger NODE_ADMIN_LOGGER = PrefixLogger.getNodeAdminLogger(NodeRepositoryImpl.class.getName());
+    private static final PrefixLogger NODE_ADMIN_LOGGER = PrefixLogger.getNodeAdminLogger(NodeRepositoryImpl.class);
     private static final String NODEREPOSITORY_PATH_PREFIX_NODES_API = "/";
 
     private JaxRsStrategy<NodeRepositoryApi> nodeRepositoryClient;
@@ -129,7 +128,7 @@ public class NodeRepositoryImpl implements NodeRepository {
         } catch (javax.ws.rs.WebApplicationException e) {
             final Response response = e.getResponse();
             UpdateNodeAttributesResponse updateResponse = response.readEntity(UpdateNodeAttributesResponse.class);
-            PrefixLogger logger = PrefixLogger.getNodeAgentLogger(NodeRepositoryImpl.class.getName(),
+            PrefixLogger logger = PrefixLogger.getNodeAgentLogger(NodeRepositoryImpl.class,
                     containerNameFromHostName(hostName.toString()));
             logger.log(LogLevel.ERROR, "Response code " + response.getStatus() + ": " + updateResponse.message);
             throw new RuntimeException("Failed to update node attributes for " + hostName.s() + ":" + updateResponse.message);
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/orchestrator/OrchestratorImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/orchestrator/OrchestratorImpl.java
index ef41b39316b..5d92bfe5cca 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/orchestrator/OrchestratorImpl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/orchestrator/OrchestratorImpl.java
@@ -30,7 +30,7 @@ import java.util.logging.Level;
  * @author dybis
  */
 public class OrchestratorImpl implements Orchestrator {
-    private static final PrefixLogger NODE_ADMIN_LOGGER = PrefixLogger.getNodeAdminLogger(OrchestratorImpl.class.getName());
+    private static final PrefixLogger NODE_ADMIN_LOGGER = PrefixLogger.getNodeAdminLogger(OrchestratorImpl.class);
     // TODO: Figure out the port dynamically.
     private static final int HARDCODED_ORCHESTRATOR_PORT = 19071;
     // TODO: Find a way to avoid duplicating this (present in orchestrator's services.xml also).
@@ -53,7 +53,7 @@ public class OrchestratorImpl implements Orchestrator {
 
     @Override
     public boolean suspend(final HostName hostName) {
-        PrefixLogger logger = PrefixLogger.getNodeAgentLogger(OrchestratorImpl.class.getName(),
+        PrefixLogger logger = PrefixLogger.getNodeAgentLogger(OrchestratorImpl.class,
                 NodeRepositoryImpl.containerNameFromHostName(hostName.toString()));
 
         try {
@@ -97,7 +97,7 @@ public class OrchestratorImpl implements Orchestrator {
 
     @Override
     public boolean resume(final HostName hostName) {
-        PrefixLogger logger = PrefixLogger.getNodeAgentLogger(OrchestratorImpl.class.getName(),
+        PrefixLogger logger = PrefixLogger.getNodeAgentLogger(OrchestratorImpl.class,
                 NodeRepositoryImpl.containerNameFromHostName(hostName.toString()));
 
         try {
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/util/PrefixLogger.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/util/PrefixLogger.java
index b94ad4192d0..8e84c21f3de 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/util/PrefixLogger.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/util/PrefixLogger.java
@@ -12,17 +12,17 @@ public class PrefixLogger {
     private String prefix;
     private Logger logger;
 
-    private PrefixLogger(String className, String prefix) {
-        this.logger = Logger.getLogger(className);
+    private PrefixLogger(Class clazz, String prefix) {
+        this.logger = Logger.getLogger(clazz.getName());
         this.prefix = prefix + ": ";
     }
 
-    public static PrefixLogger getNodeAdminLogger(String className) {
-        return new PrefixLogger(className, "NodeAdmin");
+    public static PrefixLogger getNodeAdminLogger(Class clazz) {
+        return new PrefixLogger(clazz, "NodeAdmin");
     }
 
-    public static PrefixLogger getNodeAgentLogger(String className, ContainerName containerName) {
-        return new PrefixLogger(className, "NodeAgent-" + containerName.asString());
+    public static PrefixLogger getNodeAgentLogger(Class clazz, ContainerName containerName) {
+        return new PrefixLogger(clazz, "NodeAgent-" + containerName.asString());
     }
 
     public void log(Level level, String msg, Throwable thrown) {