Replace remaining LogLevel.<level> with corresponding Level

5 files changed, 16 insertions, 16 deletions

diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/EventLog.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/EventLog.java
index 4af4b2b15a1..367771ff87a 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/EventLog.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/EventLog.java
@@ -57,9 +57,9 @@ public class EventLog implements EventLogInterface {
         }
 
         if (e instanceof NodeEvent) {
-            addNodeOnlyEvent((NodeEvent)e, logInfo ? LogLevel.INFO: Level.FINE);
+            addNodeOnlyEvent((NodeEvent)e, logInfo ? Level.INFO: Level.FINE);
         } else {
-            log.log(logInfo ? LogLevel.INFO : Level.FINE, e.toString());
+            log.log(logInfo ? Level.INFO : Level.FINE, e.toString());
         }
     }
 
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/NodeStateGatherer.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/NodeStateGatherer.java
index 87a572ce4a0..da32caa0c4e 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/NodeStateGatherer.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/NodeStateGatherer.java
@@ -157,7 +157,7 @@ public class NodeStateGatherer {
         if (req.getReply().getReturnCode() == ErrorCode.TIMEOUT) {
             String msg = "RPC timeout";
             if (info.getReportedState().getState().oneOf("ui")) {
-                eventLog.addNodeOnlyEvent(NodeEvent.forBaseline(info, prefix + "RPC timeout talking to node.", NodeEvent.Type.REPORTED, currentTime), LogLevel.INFO);
+                eventLog.addNodeOnlyEvent(NodeEvent.forBaseline(info, prefix + "RPC timeout talking to node.", NodeEvent.Type.REPORTED, currentTime), Level.INFO);
             } else if (!info.getReportedState().hasDescription() || !info.getReportedState().getDescription().equals(msg)) {
                 log.log(Level.FINE, "Failed to talk to node " + info + ": " + req.getReply().getReturnCode() + " " + req.getReply().getReturnMessage() + ": " + msg);
             }
@@ -172,7 +172,7 @@ public class NodeStateGatherer {
                 if (msg.equals("Connection refused")) {
                     msg = "Connection error: Connection refused";
                     if (info.getReportedState().getState().oneOf("ui")) {
-                        eventLog.addNodeOnlyEvent(NodeEvent.forBaseline(info, prefix + msg, NodeEvent.Type.REPORTED, currentTime), LogLevel.INFO);
+                        eventLog.addNodeOnlyEvent(NodeEvent.forBaseline(info, prefix + msg, NodeEvent.Type.REPORTED, currentTime), Level.INFO);
                     } else if (!info.getReportedState().hasDescription() || !info.getReportedState().getDescription().equals(msg)) {
                         log.log(Level.FINE, "Failed to talk to node " + info + ": " + req.getReply().getReturnCode()
                                 + " " + req.getReply().getReturnMessage() + ": " + msg);
@@ -184,7 +184,7 @@ public class NodeStateGatherer {
                         msg += " Node is no longer in slobrok.";
                     }
                     if (info.getReportedState().getState().oneOf("ui")) {
-                        eventLog.addNodeOnlyEvent(NodeEvent.forBaseline(info, prefix + msg, NodeEvent.Type.REPORTED, currentTime), LogLevel.INFO);
+                        eventLog.addNodeOnlyEvent(NodeEvent.forBaseline(info, prefix + msg, NodeEvent.Type.REPORTED, currentTime), Level.INFO);
                     } else if (!info.getReportedState().hasDescription() || !info.getReportedState().getDescription().equals(msg)) {
                         log.log(Level.FINE, "Failed to talk to node " + info + ": " + req.getReply().getReturnCode() + " " + req.getReply().getReturnMessage() + ": " + msg);
                     }
@@ -192,14 +192,14 @@ public class NodeStateGatherer {
                 } else if (msg.equals("Connection timed out")) {
                     if (info.getReportedState().getState().oneOf("ui")) {
                         msg = "Connection error: Timeout";
-                        eventLog.addNodeOnlyEvent(NodeEvent.forBaseline(info, prefix + msg, NodeEvent.Type.REPORTED, currentTime), LogLevel.INFO);
+                        eventLog.addNodeOnlyEvent(NodeEvent.forBaseline(info, prefix + msg, NodeEvent.Type.REPORTED, currentTime), Level.INFO);
                     } else {
                         log.log(Level.FINE, "Failed to talk to node " + info + ": " + req.getReply().getReturnCode() + " " + req.getReply().getReturnMessage() + ": " + msg);
                     }
                 } else {
                     msg = "Connection error: " + reason;
                     if (info.getReportedState().getState().oneOf("ui")) {
-                        eventLog.addNodeOnlyEvent(NodeEvent.forBaseline(info, prefix + msg, NodeEvent.Type.REPORTED, currentTime), LogLevel.WARNING);
+                        eventLog.addNodeOnlyEvent(NodeEvent.forBaseline(info, prefix + msg, NodeEvent.Type.REPORTED, currentTime), Level.WARNING);
                     } else if (!info.getReportedState().hasDescription() || !info.getReportedState().getDescription().equals(msg)) {
                         log.log(Level.FINE, "Failed to talk to node " + info + ": " + req.getReply().getReturnCode() + " " + req.getReply().getReturnMessage() + ": " + msg);
                     }
@@ -210,7 +210,7 @@ public class NodeStateGatherer {
                         req.getReply().getReturnCode() + ": " + req.getReply().getReturnMessage();
 
                 if (info.getReportedState().getState().oneOf("ui")) {
-                    eventLog.addNodeOnlyEvent(NodeEvent.forBaseline(info, prefix + msg, NodeEvent.Type.REPORTED, currentTime), LogLevel.WARNING);
+                    eventLog.addNodeOnlyEvent(NodeEvent.forBaseline(info, prefix + msg, NodeEvent.Type.REPORTED, currentTime), Level.WARNING);
                 } else if (!info.getReportedState().hasDescription() || !info.getReportedState().getDescription().equals(msg)) {
                     log.log(Level.FINE, "Failed to talk to node " + info + ": " + req.getReply().getReturnCode() + " " + req.getReply().getReturnMessage() + ": " + msg);
                 }
@@ -221,7 +221,7 @@ public class NodeStateGatherer {
         } else if (req.getReply().getReturnCode() == ErrorCode.NO_SUCH_METHOD) {
             String msg = "no such RPC method error";
             if (info.getReportedState().getState().oneOf("ui")) {
-                eventLog.addNodeOnlyEvent(NodeEvent.forBaseline(info, prefix + msg, NodeEvent.Type.REPORTED, currentTime), LogLevel.WARNING);
+                eventLog.addNodeOnlyEvent(NodeEvent.forBaseline(info, prefix + msg, NodeEvent.Type.REPORTED, currentTime), Level.WARNING);
             } else if (!info.getReportedState().hasDescription() || !info.getReportedState().getDescription().equals(msg)) {
                 log.log(Level.FINE, "Failed to talk to node " + info + ": " + req.getReply().getReturnCode() + " " + req.getReply().getReturnMessage() + ": " + msg);
             }
@@ -233,7 +233,7 @@ public class NodeStateGatherer {
                 log.log(Level.FINE, "Failed to get node state from " + info + " because it is still shutting down.");
             } else {
                 if (info.getReportedState().getState().oneOf("ui")) {
-                    eventLog.addNodeOnlyEvent(NodeEvent.forBaseline(info, prefix + msg, NodeEvent.Type.REPORTED, currentTime), LogLevel.INFO);
+                    eventLog.addNodeOnlyEvent(NodeEvent.forBaseline(info, prefix + msg, NodeEvent.Type.REPORTED, currentTime), Level.INFO);
                 } else if (!info.getReportedState().hasDescription() || !info.getReportedState().getDescription().equals(msg)) {
                     log.log(Level.FINE, "Failed to talk to node " + info + ": " + req.getReply().getReturnCode() + " " + req.getReply().getReturnMessage() + ": " + msg);
                 }
@@ -242,7 +242,7 @@ public class NodeStateGatherer {
         } else {
             String msg = "Got unexpected error, assumed to be node issue " + req.getReply().getReturnCode() + ": " + req.getReply().getReturnMessage();
             if (info.getReportedState().getState().oneOf("ui")) {
-                eventLog.addNodeOnlyEvent(NodeEvent.forBaseline(info, prefix + msg, NodeEvent.Type.REPORTED, currentTime), LogLevel.WARNING);
+                eventLog.addNodeOnlyEvent(NodeEvent.forBaseline(info, prefix + msg, NodeEvent.Type.REPORTED, currentTime), Level.WARNING);
             } else if (!info.getReportedState().hasDescription() || !info.getReportedState().getDescription().equals(msg)) {
                 log.log(Level.FINE, "Failed to talk to node " + info + ": " + req.getReply().getReturnCode() + " " + req.getReply().getReturnMessage() + ": " + msg);
             }
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StateChangeHandler.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StateChangeHandler.java
index abdb6255ca2..18e548f6f1c 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StateChangeHandler.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StateChangeHandler.java
@@ -132,7 +132,7 @@ public class StateChangeHandler {
         // *** LOGGING ONLY
         if ( ! reportedState.similarTo(node.getReportedState())) {
             if (reportedState.getState().equals(State.DOWN)) {
-                eventLog.addNodeOnlyEvent(NodeEvent.forBaseline(node, "Failed to get node state: " + reportedState.toString(true), NodeEvent.Type.REPORTED, currentTime), LogLevel.INFO);
+                eventLog.addNodeOnlyEvent(NodeEvent.forBaseline(node, "Failed to get node state: " + reportedState.toString(true), NodeEvent.Type.REPORTED, currentTime), Level.INFO);
             } else {
                 eventLog.addNodeOnlyEvent(NodeEvent.forBaseline(node, "Now reporting state " + reportedState.toString(true), NodeEvent.Type.REPORTED, currentTime), Level.FINE);
             }
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/SystemStateBroadcaster.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/SystemStateBroadcaster.java
index 95e03d1f6f1..502a0823b13 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/SystemStateBroadcaster.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/SystemStateBroadcaster.java
@@ -66,7 +66,7 @@ public class SystemStateBroadcaster {
         long time = timer.getCurrentTimeInMillis();
         Long lastReported = lastErrorReported.get(info.getNode());
         boolean alreadySeen = (lastReported != null && time - lastReported < minTimeBetweenNodeErrorLogging);
-        log.log((nodeOk && !alreadySeen) ? LogLevel.WARNING : Level.FINE, message);
+        log.log((nodeOk && !alreadySeen) ? Level.WARNING : Level.FINE, message);
         if (!alreadySeen) {
             lastErrorReported.put(info.getNode(), time);
         }
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/statuspage/StatusPageServer.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/statuspage/StatusPageServer.java
index 3028ffe6e2c..3d3de32c356 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/statuspage/StatusPageServer.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/statuspage/StatusPageServer.java
@@ -146,7 +146,7 @@ public class StatusPageServer implements Runnable, StatusPageServerInterface {
                 } catch (SocketTimeoutException e) {
                     // Ignore, since timeout is set to 100 ms
                 } catch (java.io.IOException e) {
-                    log.log(shouldBeConnected ? LogLevel.WARNING : Level.FINE, "Caught IO exception in ServerSocket.accept(): " + e.getMessage());
+                    log.log(shouldBeConnected ? Level.WARNING : Level.FINE, "Caught IO exception in ServerSocket.accept(): " + e.getMessage());
                 }
                 if (connection == null) continue;
                 log.log(Level.FINE, "Got a status page request.");
@@ -235,7 +235,7 @@ public class StatusPageServer implements Runnable, StatusPageServerInterface {
                     output.write(header.toString().getBytes());
                     output.write(response.getOutputStream().toByteArray());
                 } catch (java.io.IOException e) {
-                   log.log(e.getMessage().indexOf("Broken pipe") >= 0 ? Level.FINE : LogLevel.INFO,
+                   log.log(e.getMessage().indexOf("Broken pipe") >= 0 ? Level.FINE : Level.INFO,
                            "Failed to process HTTP request : " + e.getMessage());
                 } catch (Exception e) {
                     log.log(Level.WARNING, "Caught exception in HTTP server thread: "
@@ -244,7 +244,7 @@ public class StatusPageServer implements Runnable, StatusPageServerInterface {
                     if (output != null) try {
                         output.close();
                     } catch (IOException e) {
-                        log.log(e.getMessage().indexOf("Broken pipe") >= 0 ? Level.FINE : LogLevel.INFO,
+                        log.log(e.getMessage().indexOf("Broken pipe") >= 0 ? Level.FINE : Level.INFO,
                                 "Failed to close output stream on socket " + connection + ": " + e.getMessage());
                     }
                     if (connection != null) try{