Remove PrefixLogger

3 files changed, 7 insertions, 73 deletions

diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/ConfigServerApiImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/ConfigServerApiImpl.java
index 3d1c49fc166..73c86fc8de1 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/ConfigServerApiImpl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/ConfigServerApiImpl.java
@@ -7,7 +7,6 @@ import com.yahoo.config.provision.HostName;
 import com.yahoo.vespa.athenz.identity.ServiceIdentitySslSocketFactory;
 import com.yahoo.vespa.athenz.identity.SiaIdentityProvider;
 import com.yahoo.vespa.hosted.node.admin.component.ConfigServerInfo;
-import com.yahoo.vespa.hosted.node.admin.util.PrefixLogger;
 import org.apache.http.HttpHeaders;
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.CloseableHttpResponse;
@@ -38,6 +37,7 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
+import java.util.logging.Logger;
 
 /**
  * Retries request on config server a few times before giving up. Assumes that all requests should be sent with
@@ -47,7 +47,7 @@ import java.util.Optional;
  * @author bjorncs
  */
 public class ConfigServerApiImpl implements ConfigServerApi {
-    private static final PrefixLogger NODE_ADMIN_LOGGER = PrefixLogger.getNodeAdminLogger(ConfigServerApiImpl.class);
+    private static final Logger logger = Logger.getLogger(ConfigServerApiImpl.class.getName());
 
     private final ObjectMapper mapper = new ObjectMapper();
 
@@ -117,9 +117,9 @@ public class ConfigServerApiImpl implements ConfigServerApi {
 
                 // Failure to communicate with a config server is not abnormal during upgrades
                 if (e.getMessage().contains("(Connection refused)")) {
-                    NODE_ADMIN_LOGGER.info("Connection refused to " + configServer + " (upgrading?), will try next");
+                    logger.info("Connection refused to " + configServer + " (upgrading?), will try next");
                 } else {
-                    NODE_ADMIN_LOGGER.warning("Failed to communicate with " + configServer + ", will try next: " + e.getMessage());
+                    logger.warning("Failed to communicate with " + configServer + ", will try next: " + e.getMessage());
                 }
             }
         }
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepository.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepository.java
index 9c41d70bff4..fe19b81614d 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepository.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepository.java
@@ -12,7 +12,6 @@ import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.bindings.Ge
 import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.bindings.GetNodesResponse;
 import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.bindings.NodeMessageResponse;
 import com.yahoo.vespa.hosted.node.admin.configserver.noderepository.bindings.NodeRepositoryNode;
-import com.yahoo.vespa.hosted.node.admin.util.PrefixLogger;
 
 import java.time.Instant;
 import java.util.List;
@@ -22,6 +21,7 @@ import java.util.Optional;
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.function.Function;
+import java.util.logging.Logger;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -29,7 +29,7 @@ import java.util.stream.Stream;
  * @author stiankri, dybis
  */
 public class RealNodeRepository implements NodeRepository {
-    private static final PrefixLogger NODE_ADMIN_LOGGER = PrefixLogger.getNodeAdminLogger(RealNodeRepository.class);
+    private static final Logger logger = Logger.getLogger(RealNodeRepository.class.getName());
 
     private final ConfigServerApi configServerApi;
 
@@ -130,7 +130,7 @@ public class RealNodeRepository implements NodeRepository {
                 "/nodes/v2/state/" + state + "/" + hostName,
                 Optional.empty(), /* body */
                 NodeMessageResponse.class);
-        NODE_ADMIN_LOGGER.info(response.message);
+        logger.info(response.message);
 
         if (Strings.isNullOrEmpty(response.errorCode)) return;
         throw new NodeRepositoryException("Failed to set node state: " + response.message + " " + response.errorCode);
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
deleted file mode 100644
index f4d85a19f6d..00000000000
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/util/PrefixLogger.java
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vespa.hosted.node.admin.util;
-
-import com.yahoo.log.LogLevel;
-import com.yahoo.vespa.hosted.dockerapi.ContainerName;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * @author freva
- */
-public class PrefixLogger {
-    private final String prefix;
-    private final Logger logger;
-
-    private <T> PrefixLogger(Class<T> clazz, String prefix) {
-        this.logger = Logger.getLogger(clazz.getName());
-        this.prefix = prefix + ": ";
-    }
-
-    public static <T> PrefixLogger getNodeAdminLogger(Class<T> clazz) {
-        return new PrefixLogger(clazz, "NodeAdmin");
-    }
-
-    public static <T> PrefixLogger getNodeAgentLogger(Class<T> clazz, ContainerName containerName) {
-        return new PrefixLogger(clazz, "NodeAgent-" + containerName.asString());
-    }
-
-    private void log(Level level, String message, Throwable thrown) {
-        logger.log(level, prefix + message, thrown);
-    }
-
-    private void log(Level level, String message) {
-        logger.log(level, prefix + message);
-    }
-
-
-    public void debug(String message) {
-        log(LogLevel.DEBUG, message);
-    }
-
-    public void info(String message) {
-        log(LogLevel.INFO, message);
-    }
-
-    public void info(String message, Throwable thrown) {
-        log(LogLevel.INFO, message, thrown);
-    }
-
-    public void error(String message) {
-        log(LogLevel.ERROR, message);
-    }
-
-    public void error(String message, Throwable thrown) {
-        log(LogLevel.ERROR, message, thrown);
-    }
-
-    public void warning(String message) {
-        log(LogLevel.WARNING, message);
-    }
-
-    public void warning(String message, Throwable thrown) {
-        log(LogLevel.WARNING, message, thrown);
-    }
-}