Removed severe, added error and made general log() private

5 files changed, 12 insertions, 11 deletions

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 6c7cc656c6a..8b19305b1c2 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
@@ -85,7 +85,7 @@ public class MaintenanceSchedulerImpl implements MaintenanceScheduler {
             String errors = IOUtils.readAll(new InputStreamReader(p.getErrorStream()));
 
             if (! output.isEmpty()) logger.info(output);
-            if (! errors.isEmpty()) logger.severe(errors);
+            if (! errors.isEmpty()) logger.error(errors);
         } catch (IOException e) {
             e.printStackTrace();
         }
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 a47bc933a0d..8c724eea16a 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
@@ -102,7 +102,7 @@ public class NodeAdminStateUpdater extends AbstractComponent {
     private void fetchContainersToRunFromNodeRepository(final NodeRepository nodeRepository) {
         synchronized (monitor) {
             if (nodeAdmin.isFrozen()) {
-                logger.log(Level.FINE, "Frozen, skipping fetching info from node repository");
+                logger.info("Frozen, skipping fetching info from node repository");
                 return;
             }
             final List<ContainerNodeSpec> containersToRun;
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 2df9debccc8..af7e394db8f 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
@@ -153,10 +153,10 @@ public class NodeAgentImpl implements NodeAgent {
         try {
             loopThread.join(10000);
             if (loopThread.isAlive()) {
-                logger.severe("Could not stop host thread " + hostname);
+                logger.error("Could not stop host thread " + hostname);
             }
         } catch (InterruptedException e1) {
-            logger.severe("Interrupted; Could not stop host thread " + hostname);
+            logger.error("Interrupted; Could not stop host thread " + hostname);
         }
     }
 
@@ -250,7 +250,7 @@ public class NodeAgentImpl implements NodeAgent {
                     try {
                         monitor.wait(waittimeLeft);
                     } catch (InterruptedException e) {
-                        logger.severe("Interrupted, but ignoring this: " + hostname);
+                        logger.error("Interrupted, but ignoring this: " + hostname);
                         continue;
                     }
                     waittimeLeft -= Duration.between(start, Instant.now()).toMillis();
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 c2c95e7260a..9a4a7ae7a00 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
@@ -130,7 +130,7 @@ public class NodeRepositoryImpl implements NodeRepository {
             UpdateNodeAttributesResponse updateResponse = response.readEntity(UpdateNodeAttributesResponse.class);
             PrefixLogger logger = PrefixLogger.getNodeAgentLogger(NodeRepositoryImpl.class,
                     containerNameFromHostName(hostName.toString()));
-            logger.log(LogLevel.ERROR, "Response code " + response.getStatus() + ": " + updateResponse.message);
+            logger.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/util/PrefixLogger.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/util/PrefixLogger.java
index a08c62a36b0..db16ac62b1f 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
@@ -1,5 +1,6 @@
 package com.yahoo.vespa.hosted.node.admin.util;
 
+import com.yahoo.log.LogLevel;
 import com.yahoo.vespa.hosted.node.admin.docker.ContainerName;
 
 import java.util.logging.Level;
@@ -29,19 +30,19 @@ public class PrefixLogger {
         logger.log(level, prefix + message, thrown);
     }
 
-    public void log(Level level, String message) {
+    private void log(Level level, String message) {
         logger.log(level, prefix + message);
     }
 
     public void info(String message) {
-        log(Level.INFO, message);
+        log(LogLevel.INFO, message);
     }
 
-    public void severe(String message) {
-        log(Level.SEVERE, message);
+    public void error(String message) {
+        log(LogLevel.ERROR, message);
     }
 
     public void warning(String message) {
-        log(Level.WARNING, message);
+        log(LogLevel.WARNING, message);
     }
 }