1 files changed, 17 insertions, 15 deletions
diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/core/ConsoleLogListener.java b/jdisc_core/src/main/java/com/yahoo/jdisc/core/ConsoleLogListener.java
index 2cfa604109b..1d872bbcb64 100644
--- a/jdisc_core/src/main/java/com/yahoo/jdisc/core/ConsoleLogListener.java
+++ b/jdisc_core/src/main/java/com/yahoo/jdisc/core/ConsoleLogListener.java
@@ -3,62 +3,64 @@ package com.yahoo.jdisc.core;
 
 import com.yahoo.net.HostName;
 import org.osgi.service.log.LogEntry;
+import org.osgi.service.log.LogLevel;
 import org.osgi.service.log.LogListener;
 
 import java.io.PrintStream;
+import java.util.Optional;
 
 /**
  * @author Vikas Panwar
  */
 class ConsoleLogListener implements LogListener {
 
-    public static final int DEFAULT_LOG_LEVEL = Integer.MAX_VALUE;
+    public static final LogLevel DEFAULT_LOG_LEVEL = LogLevel.TRACE;
     private final ConsoleLogFormatter formatter;
     private final PrintStream out;
-    private final int maxLevel;
+    private final LogLevel maxLevel;
 
     ConsoleLogListener(PrintStream out, String serviceName, String logLevel) {
         this.out = out;
         this.formatter = new ConsoleLogFormatter(getHostname(), getProcessId(), serviceName);
-        this.maxLevel = parseLogLevel(logLevel);
+        this.maxLevel = parseLogLevel(logLevel).orElse(null);
     }
 
     @Override
     public void logged(LogEntry entry) {
-        if (entry.getLevel() > maxLevel) {
+        if (maxLevel == null || !maxLevel.implies(entry.getLogLevel())) {
             return;
         }
         out.println(formatter.formatEntry(entry));
     }
 
-    public static int parseLogLevel(String logLevel) {
+    public static Optional<LogLevel> parseLogLevel(String logLevel) {
         if (logLevel == null || logLevel.isEmpty()) {
-            return DEFAULT_LOG_LEVEL;
+            return Optional.of(DEFAULT_LOG_LEVEL);
         }
         if (logLevel.equalsIgnoreCase("OFF")) {
-            return Integer.MIN_VALUE;
+            return Optional.empty();
         }
         if (logLevel.equalsIgnoreCase("ERROR")) {
-            return 1;
+            return Optional.of(LogLevel.ERROR);
         }
         if (logLevel.equalsIgnoreCase("WARNING")) {
-            return 2;
+            return Optional.of(LogLevel.WARN);
         }
         if (logLevel.equalsIgnoreCase("INFO")) {
-            return 3;
+            return Optional.of(LogLevel.INFO);
         }
         if (logLevel.equalsIgnoreCase("DEBUG")) {
-            return 4;
+            return Optional.of(LogLevel.DEBUG);
         }
         if (logLevel.equalsIgnoreCase("ALL")) {
-            return Integer.MAX_VALUE;
+            return Optional.of(LogLevel.TRACE);
         }
         try {
-            return Integer.valueOf(logLevel);
-        } catch (NumberFormatException e) {
+            return Optional.of(LogLevel.values()[Integer.parseInt(logLevel)]);
+        } catch (NumberFormatException | IndexOutOfBoundsException e) {
             // fall through
         }
-        return DEFAULT_LOG_LEVEL;
+        return Optional.of(DEFAULT_LOG_LEVEL);
     }
 
     public static ConsoleLogListener newInstance() {