Use Vespa LogLevel where appropriate.

2 files changed, 8 insertions, 5 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/DeployHandlerLogger.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/DeployHandlerLogger.java
index ced73cda6fb..c33c5ff9f57 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/DeployHandlerLogger.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/DeployHandlerLogger.java
@@ -3,7 +3,8 @@ package com.yahoo.vespa.config.server.deploy;
 
 import com.yahoo.config.application.api.DeployLogger;
 import com.yahoo.config.provision.ApplicationId;
-import java.util.logging.Level;
+
+import com.yahoo.log.LogLevel;
 import com.yahoo.slime.Cursor;
 import com.yahoo.slime.Slime;
 import com.yahoo.vespa.config.server.tenant.TenantRepository;
@@ -34,8 +35,8 @@ public class DeployHandlerLogger implements DeployLogger {
     @Override
     public void log(Level level, String message) {
         if ((level == Level.FINE ||
-             level == Level.FINE ||
-             level == Level.FINEST) &&
+             level == LogLevel.DEBUG ||
+             level == LogLevel.SPAM) &&
             !verbose) {
             return;
         }
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/DeployHandlerLoggerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/DeployHandlerLoggerTest.java
index 078836401ac..6aa72e3e672 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/DeployHandlerLoggerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/DeployHandlerLoggerTest.java
@@ -4,6 +4,8 @@ package com.yahoo.vespa.config.server.deploy;
 import com.yahoo.config.application.api.DeployLogger;
 import com.yahoo.config.provision.ApplicationId;
 import java.util.logging.Level;
+
+import com.yahoo.log.LogLevel;
 import com.yahoo.slime.Cursor;
 import com.yahoo.slime.JsonFormat;
 import com.yahoo.slime.Slime;
@@ -42,8 +44,8 @@ public class DeployHandlerLoggerTest {
     }
 
     private void logMessages(DeployLogger logger) {
-        logger.log(Level.FINE, "foobar");
-        logger.log(Level.FINEST, "foobar");
+        logger.log(LogLevel.DEBUG, "foobar");
+        logger.log(LogLevel.SPAM, "foobar");
         logger.log(Level.FINE, "baz");
         logger.log(Level.WARNING, "baz");
     }