Converted all node admin prefix loggers to static

4 files changed, 14 insertions, 14 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 3874b4316fd..8148c1ad13e 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,6 +58,8 @@ 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 int SECONDS_TO_WAIT_BEFORE_KILLING = 10;
     private static final String FRAMEWORK_CONTAINER_PREFIX = "/";
     private static final Pattern VESPA_VERSION_PATTERN = Pattern.compile("^(\\S*)$", Pattern.MULTILINE);
@@ -425,20 +427,18 @@ public class DockerImpl implements Docker {
 
     @Override
     public void deleteImage(final DockerImage dockerImage) {
-        PrefixLogger logger = PrefixLogger.getNodeAdminLogger(DockerImpl.class.getName());
-
         try {
-            logger.log(Level.INFO, "Deleting docker image " + dockerImage);
+            NODE_ADMIN_LOGGER.log(Level.INFO, "Deleting docker image " + dockerImage);
             final List<RemovedImage> removedImages = docker.removeImage(dockerImage.asString());
             for (RemovedImage removedImage : removedImages) {
                 if (removedImage.type() != RemovedImage.Type.DELETED) {
-                    logger.log(Level.INFO, "Result of deleting docker image " + dockerImage + ": " + removedImage);
+                    NODE_ADMIN_LOGGER.log(Level.INFO, "Result of deleting docker image " + dockerImage + ": " + removedImage);
                 }
             }
         } catch (InterruptedException e) {
             throw new RuntimeException("Unexpected interrupt", e);
         } catch (DockerException e) {
-            logger.log(Level.WARNING, "Could not delete docker image " + dockerImage, e);
+            NODE_ADMIN_LOGGER.log(Level.WARNING, "Could not delete docker image " + dockerImage, e);
         }
     }
 
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 fe7ac5742fc..dd5d2c5a411 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,6 +19,8 @@ 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 String[] baseArguments = {"sudo", "/home/y/libexec/vespa/node-admin/maintenance.sh"};
 
     @Override
@@ -50,9 +52,8 @@ public class MaintenanceSchedulerImpl implements MaintenanceScheduler {
 
     @Override
     public void cleanNodeAdmin() {
-        PrefixLogger logger = PrefixLogger.getNodeAdminLogger(MaintenanceSchedulerImpl.class.getName());
-        execute(logger, Maintainer.JOB_DELETE_OLD_APP_DATA);
-        execute(logger, Maintainer.JOB_CLEAN_HOME);
+        execute(NODE_ADMIN_LOGGER, Maintainer.JOB_DELETE_OLD_APP_DATA);
+        execute(NODE_ADMIN_LOGGER, Maintainer.JOB_CLEAN_HOME);
     }
 
     @Override
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 3dadf882231..e7e2168a8be 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
@@ -29,6 +29,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 String NODEREPOSITORY_PATH_PREFIX_NODES_API = "/";
 
     private JaxRsStrategy<NodeRepositoryApi> nodeRepositoryClient;
@@ -45,7 +46,6 @@ public class NodeRepositoryImpl implements NodeRepository {
 
     @Override
     public List<ContainerNodeSpec> getContainersToRun() throws IOException {
-        PrefixLogger logger = PrefixLogger.getNodeAdminLogger(NodeRepositoryImpl.class.getName());
         final GetNodesResponse nodesForHost = nodeRepositoryClient.apply(nodeRepositoryApi ->
                 nodeRepositoryApi.getNodesWithParentHost(baseHostName, true));
 
@@ -59,7 +59,7 @@ public class NodeRepositoryImpl implements NodeRepository {
             try {
                 nodeSpec = createContainerNodeSpec(node);
             } catch (IllegalArgumentException | NullPointerException e) {
-                logger.log(LogLevel.WARNING, "Bad node received from node repo when requesting children of the "
+                NODE_ADMIN_LOGGER.log(LogLevel.WARNING, "Bad node received from node repo when requesting children of the "
                         + baseHostName + " host: " + node, e);
                 continue;
             }
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 ca90ca1b48f..ef41b39316b 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,6 +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());
     // 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).
@@ -75,8 +76,6 @@ public class OrchestratorImpl implements Orchestrator {
 
     @Override
     public Optional<String> suspend(String parentHostName, List<String> hostNames) {
-        PrefixLogger logger = PrefixLogger.getNodeAdminLogger(OrchestratorImpl.class.getName());
-
         try {
             return hostSuspensionClient.apply(hostSuspensionClient -> {
                 BatchHostSuspendRequest request = new BatchHostSuspendRequest(parentHostName, hostNames);
@@ -88,10 +87,10 @@ public class OrchestratorImpl implements Orchestrator {
                 // Orchestrator doesn't care about this node, so don't let that stop us.
                 return Optional.empty();
             }
-            logger.log(Level.INFO, "Orchestrator rejected suspend request for host " + parentHostName, e);
+            NODE_ADMIN_LOGGER.log(Level.INFO, "Orchestrator rejected suspend request for host " + parentHostName, e);
             return Optional.of(e.getLocalizedMessage());
         } catch (IOException e) {
-            logger.log(Level.WARNING, "Unable to communicate with orchestrator", e);
+            NODE_ADMIN_LOGGER.log(Level.WARNING, "Unable to communicate with orchestrator", e);
             return Optional.of("Unable to communicate with orchestrator" + e.getMessage());
         }
     }