LogLevel.INFO -> Level.INFO

13 files changed, 80 insertions, 80 deletions

diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetController.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetController.java
index 4ae0fef015b..bfa202432b6 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetController.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetController.java
@@ -299,12 +299,12 @@ public class FleetController implements NodeStateOrHostInfoChangeHandler, NodeAd
 
     public void shutdown() throws InterruptedException, java.io.IOException {
         if (runner != null && isRunning()) {
-            log.log(LogLevel.INFO,  "Joining event thread.");
+            log.log(Level.INFO,  "Joining event thread.");
             running.set(false);
             synchronized(monitor) { monitor.notifyAll(); }
             runner.join();
         }
-        log.log(LogLevel.INFO,  "Fleetcontroller done shutting down event thread.");
+        log.log(Level.INFO,  "Fleetcontroller done shutting down event thread.");
         controllerThreadId = Thread.currentThread().getId();
         database.shutdown(this);
 
@@ -321,7 +321,7 @@ public class FleetController implements NodeStateOrHostInfoChangeHandler, NodeAd
     public void updateOptions(FleetControllerOptions options, long configGeneration) {
         synchronized(monitor) {
             assert(this.options.fleetControllerIndex == options.fleetControllerIndex);
-            log.log(LogLevel.INFO, "Fleetcontroller " + options.fleetControllerIndex + " has new options");
+            log.log(Level.INFO, "Fleetcontroller " + options.fleetControllerIndex + " has new options");
             nextOptions = options.clone();
             nextConfigGeneration = configGeneration;
             monitor.notifyAll();
@@ -1125,7 +1125,7 @@ public class FleetController implements NodeStateOrHostInfoChangeHandler, NodeAd
                     }
                 }
                 if (ackedNodes >= nodeCount) {
-                    log.log(LogLevel.INFO, ackedNodes + " nodes now have acked system state " + version + " or higher.");
+                    log.log(Level.INFO, ackedNodes + " nodes now have acked system state " + version + " or higher.");
                     return;
                 }
                 long remainingTime = maxTime - System.currentTimeMillis();
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/MasterElectionHandler.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/MasterElectionHandler.java
index 1bfd86e9bc9..7b026dd6a74 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/MasterElectionHandler.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/MasterElectionHandler.java
@@ -116,25 +116,25 @@ public class MasterElectionHandler implements MasterInterface {
             // Move next data to temporary, such that we don't need to keep lock, and such that we don't retry
             // if we happen to fail processing the data.
         Map<Integer, Integer> state;
-        log.log(LogLevel.INFO, "Cluster controller " + index + ": Handling new master election, as we have received " + nextMasterData.size() + " entries");
+        log.log(Level.INFO, "Cluster controller " + index + ": Handling new master election, as we have received " + nextMasterData.size() + " entries");
         synchronized (monitor) {
             state = nextMasterData;
             nextMasterData = null;
         }
-        log.log(LogLevel.INFO, "Cluster controller " + index + ": Got master election state " + toString(state) + ".");
+        log.log(Level.INFO, "Cluster controller " + index + ": Got master election state " + toString(state) + ".");
         if (state.isEmpty()) throw new IllegalStateException("Database has no master data. We should at least have data for ourselves.");
         Map.Entry<Integer, Integer> first = state.entrySet().iterator().next();
         Integer currentMaster = getMaster();
         if (currentMaster != null && first.getKey().intValue() != currentMaster.intValue()) {
-            log.log(LogLevel.INFO, "Cluster controller " + index + ": Master gone from ZooKeeper. Tagging timestamp. Will wait " + this.masterZooKeeperCooldownPeriod + " ms.");
+            log.log(Level.INFO, "Cluster controller " + index + ": Master gone from ZooKeeper. Tagging timestamp. Will wait " + this.masterZooKeeperCooldownPeriod + " ms.");
             masterGoneFromZooKeeperTime = timer.getCurrentTimeInMillis();
             masterCandidate = null;
         }
         if (first.getValue().intValue() != first.getKey().intValue()) {
-            log.log(LogLevel.INFO, "Fleet controller " + index + ": First index is not currently trying to become master. Waiting for it to change state");
+            log.log(Level.INFO, "Fleet controller " + index + ": First index is not currently trying to become master. Waiting for it to change state");
             masterCandidate = null;
             if (first.getKey() == index) {
-                log.log(LogLevel.INFO, "Cluster controller " + index + ": We are next in line to become master. Altering our state to look for followers");
+                log.log(Level.INFO, "Cluster controller " + index + ": We are next in line to become master. Altering our state to look for followers");
                 database.setMasterVote(dbContext, index);
             }
         } else {
@@ -148,21 +148,21 @@ public class MasterElectionHandler implements MasterInterface {
             if (2 * followers > totalCount) {
                 Integer newMaster = getMaster();
                 if (newMaster != null && currentMaster != null && newMaster.intValue() == currentMaster.intValue()) {
-                    log.log(LogLevel.INFO, "MASTER_ELECTION: Cluster controller " + index + ": " + currentMaster + " is still the master");
+                    log.log(Level.INFO, "MASTER_ELECTION: Cluster controller " + index + ": " + currentMaster + " is still the master");
                 } else if (newMaster != null && currentMaster != null) {
-                    log.log(LogLevel.INFO, "MASTER_ELECTION: Cluster controller " + index + ": " + newMaster + " took over for fleet controller " + currentMaster + " as master");
+                    log.log(Level.INFO, "MASTER_ELECTION: Cluster controller " + index + ": " + newMaster + " took over for fleet controller " + currentMaster + " as master");
                 } else if (newMaster == null) {
-                    log.log(LogLevel.INFO, "MASTER_ELECTION: Cluster controller " + index + ": " + masterCandidate + " is new master candidate, but needs to wait before it can take over");
+                    log.log(Level.INFO, "MASTER_ELECTION: Cluster controller " + index + ": " + masterCandidate + " is new master candidate, but needs to wait before it can take over");
                 }  else {
-                    log.log(LogLevel.INFO, "MASTER_ELECTION: Cluster controller " + index + ": " + newMaster + " is newly elected master");
+                    log.log(Level.INFO, "MASTER_ELECTION: Cluster controller " + index + ": " + newMaster + " is newly elected master");
                 }
             } else {
-                log.log(LogLevel.INFO, "MASTER_ELECTION: Cluster controller " + index + ": Currently too few followers for cluster controller candidate " + masterCandidate + ". No current master. (" + followers + "/" + totalCount + " followers)");
+                log.log(Level.INFO, "MASTER_ELECTION: Cluster controller " + index + ": Currently too few followers for cluster controller candidate " + masterCandidate + ". No current master. (" + followers + "/" + totalCount + " followers)");
             }
             Integer ourState = state.get(index);
             if (ourState == null) throw new IllegalStateException("Database lacks data from ourselves. This should always be present.");
             if (ourState.intValue() != first.getKey().intValue()) {
-                log.log(LogLevel.INFO, "Cluster controller " + index + ": Altering our state to follow new fleet controller master candidate " + first.getKey());
+                log.log(Level.INFO, "Cluster controller " + index + ": Altering our state to follow new fleet controller master candidate " + first.getKey());
                 database.setMasterVote(dbContext, first.getKey());
             }
         }
@@ -209,7 +209,7 @@ public class MasterElectionHandler implements MasterInterface {
     }
 
     public void handleFleetData(Map<Integer, Integer> data) {
-        log.log(LogLevel.INFO, "Cluster controller " + index + ": Got new fleet data with " + data.size() + " entries: " + data);
+        log.log(Level.INFO, "Cluster controller " + index + ": Got new fleet data with " + data.size() + " entries: " + data);
         synchronized (monitor) {
             nextMasterData = data;
             monitor.notifyAll();
@@ -218,7 +218,7 @@ public class MasterElectionHandler implements MasterInterface {
 
     public void lostDatabaseConnection() {
         if (totalCount > 1) {
-            log.log(LogLevel.INFO, "Cluster controller " + index + ": Clearing master data as we lost connection on node " + index);
+            log.log(Level.INFO, "Cluster controller " + index + ": Clearing master data as we lost connection on node " + index);
             masterData = null;
             masterCandidate = null;
             followers = 0;
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 d6b8364954b..645ad694a0c 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
@@ -263,7 +263,7 @@ public class SystemStateBroadcaster {
         ClusterState baselineState = clusterStateBundle.getBaselineClusterState();
 
         if (!baselineState.isOfficial()) {
-            log.log(LogLevel.INFO, String.format("Publishing cluster state version %d", baselineState.getVersion()));
+            log.log(Level.INFO, String.format("Publishing cluster state version %d", baselineState.getVersion()));
             baselineState.setOfficial(true); // FIXME this violates state bundle immutability
         }
 
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/database/DatabaseHandler.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/database/DatabaseHandler.java
index a7570ce5028..f648f08a3ea 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/database/DatabaseHandler.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/database/DatabaseHandler.java
@@ -115,7 +115,7 @@ public class DatabaseHandler {
         synchronized (databaseMonitor) {
             wasRunning = database != null;
             if (wasRunning) {
-                log.log(LogLevel.INFO, "Fleetcontroller " + nodeIndex + ": Resetting database state");
+                log.log(Level.INFO, "Fleetcontroller " + nodeIndex + ": Resetting database state");
                 database.close();
                 database = null;
             }
@@ -123,7 +123,7 @@ public class DatabaseHandler {
         clearSessionMetaData();
 
         if (wasRunning) {
-            log.log(LogLevel.INFO, "Fleetcontroller " + nodeIndex + ": Done resetting database state");
+            log.log(Level.INFO, "Fleetcontroller " + nodeIndex + ": Done resetting database state");
         }
     }
 
@@ -141,7 +141,7 @@ public class DatabaseHandler {
         if (address == null && zooKeeperAddress == null) return;
         if (address != null && zooKeeperAddress != null && address.equals(zooKeeperAddress)) return;
         if (zooKeeperAddress != null) {
-            log.log(LogLevel.INFO, "Fleetcontroller " + nodeIndex + ": " + (address == null ? "Stopped using ZooKeeper." : "Got new ZooKeeper address to use: " + address));
+            log.log(Level.INFO, "Fleetcontroller " + nodeIndex + ": " + (address == null ? "Stopped using ZooKeeper." : "Got new ZooKeeper address to use: " + address));
         }
         zooKeeperAddress = address;
         reset();
@@ -165,7 +165,7 @@ public class DatabaseHandler {
                 }
                 // We still hold the database lock while calling this, we want to block callers.
                 clearSessionMetaData();
-                log.log(LogLevel.INFO,
+                log.log(Level.INFO,
                         "Fleetcontroller " + nodeIndex + ": Setting up new ZooKeeper session at " + zooKeeperAddress);
                 DatabaseFactory.Params params = new DatabaseFactory.Params()
                         .cluster(cluster)
@@ -189,7 +189,7 @@ public class DatabaseHandler {
             log.log(LogLevel.WARNING, "Fleetcontroller " + nodeIndex + ": Failed to connect to ZooKeeper at " + zooKeeperAddress
                     + " with session timeout " + zooKeeperSessionTimeout + ": " + sw);
         }
-        log.log(LogLevel.INFO, "Fleetcontroller " + nodeIndex + ": Done setting up new ZooKeeper session at " + zooKeeperAddress);
+        log.log(Level.INFO, "Fleetcontroller " + nodeIndex + ": Done setting up new ZooKeeper session at " + zooKeeperAddress);
     }
 
     /**
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/database/MasterDataGatherer.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/database/MasterDataGatherer.java
index 8daa132ee5a..1c50afa4310 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/database/MasterDataGatherer.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/database/MasterDataGatherer.java
@@ -51,11 +51,11 @@ public class MasterDataGatherer {
         public void process(WatchedEvent watchedEvent) {
             switch (watchedEvent.getType()) {
                 case NodeChildrenChanged: // Fleetcontrollers have either connected or disconnected to ZooKeeper
-                    log.log(LogLevel.INFO, "Fleetcontroller " + nodeIndex + ": A change occurred in the list of registered fleetcontrollers. Requesting new information");
+                    log.log(Level.INFO, "Fleetcontroller " + nodeIndex + ": A change occurred in the list of registered fleetcontrollers. Requesting new information");
                     session.getChildren(zooKeeperRoot + "indexes", this, childListener, null);
                     break;
                 case NodeDataChanged: // A fleetcontroller has changed what node it is voting for
-                    log.log(LogLevel.INFO, "Fleetcontroller " + nodeIndex + ": Altered data in node " + watchedEvent.getPath() + ". Requesting new vote");
+                    log.log(Level.INFO, "Fleetcontroller " + nodeIndex + ": Altered data in node " + watchedEvent.getPath() + ". Requesting new vote");
                     int index = getIndex(watchedEvent.getPath());
                     synchronized (nextMasterData) {
                         nextMasterData.put(index, null);
@@ -84,7 +84,7 @@ public class MasterDataGatherer {
     private class DirCallback implements AsyncCallback.ChildrenCallback {
         public void processResult(int version, String path, Object context, List<String> nodes) {
             if (nodes == null) nodes = new LinkedList<String>();
-            log.log(LogLevel.INFO, "Fleetcontroller " + nodeIndex + ": Got node list response from " + path + " version " + version + " with " + nodes.size() + " nodes");
+            log.log(Level.INFO, "Fleetcontroller " + nodeIndex + ": Got node list response from " + path + " version " + version + " with " + nodes.size() + " nodes");
             synchronized (nextMasterData) {
                 nextMasterData.clear();
                 for (String node : nodes) {
@@ -105,14 +105,14 @@ public class MasterDataGatherer {
 
         public void processResult(int code, String path, Object context, byte[] rawdata, Stat stat) {
             String data = rawdata == null ? null : new String(rawdata, utf8);
-            log.log(LogLevel.INFO, "Fleetcontroller " + nodeIndex + ": Got vote data from path " + path +
+            log.log(Level.INFO, "Fleetcontroller " + nodeIndex + ": Got vote data from path " + path +
                     " with code " + code + " and data " + data);
 
             int index = getIndex(path);
             synchronized (nextMasterData) {
                 if (code != KeeperException.Code.OK.intValue()) {
                     if (code == KeeperException.Code.NONODE.intValue()) {
-                        log.log(LogLevel.INFO, "Fleetcontroller " + nodeIndex + ": Node at " + path +
+                        log.log(Level.INFO, "Fleetcontroller " + nodeIndex + ": Node at " + path +
                                 " removed, got no other option than counting it as down.");
                     } else {
                         log.log(LogLevel.WARNING, "Fleetcontroller " + nodeIndex + ": Failure code " + code +
@@ -129,7 +129,7 @@ public class MasterDataGatherer {
                         if (value.equals(nextMasterData.get(index))) {
                             log.log(Level.FINE, "Fleetcontroller " + nodeIndex + ": Got vote from fleetcontroller " + index + ", which already was " + value + ".");
                         } else {
-                            log.log(LogLevel.INFO, "Fleetcontroller " + nodeIndex + ": Got vote from fleetcontroller " + index + ". Altering vote from " + nextMasterData.get(index) + " to " + value + ".");
+                            log.log(Level.INFO, "Fleetcontroller " + nodeIndex + ": Got vote from fleetcontroller " + index + ". Altering vote from " + nextMasterData.get(index) + " to " + value + ".");
                             nextMasterData.put(index, value);
                         }
                     } else {
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/database/ZooKeeperDatabase.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/database/ZooKeeperDatabase.java
index 834ecab9f5b..7e878c80fdb 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/database/ZooKeeperDatabase.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/database/ZooKeeperDatabase.java
@@ -58,17 +58,17 @@ public class ZooKeeperDatabase extends Database {
             Event.KeeperState newState = watchedEvent.getState();
             if (state == null || !state.equals(newState)) switch (newState) {
                 case Expired:
-                    log.log(LogLevel.INFO, "Fleetcontroller " + nodeIndex + ": Zookeeper session expired");
+                    log.log(Level.INFO, "Fleetcontroller " + nodeIndex + ": Zookeeper session expired");
                     sessionOpen = false;
                     listener.handleZooKeeperSessionDown();
                     break;
                 case Disconnected:
-                    log.log(LogLevel.INFO, "Fleetcontroller " + nodeIndex + ": Lost connection to zookeeper server");
+                    log.log(Level.INFO, "Fleetcontroller " + nodeIndex + ": Lost connection to zookeeper server");
                     sessionOpen = false;
                     listener.handleZooKeeperSessionDown();
                     break;
                 case SyncConnected:
-                    log.log(LogLevel.INFO, "Fleetcontroller " + nodeIndex + ": Connection to zookeeper server established. Refetching master data");
+                    log.log(Level.INFO, "Fleetcontroller " + nodeIndex + ": Connection to zookeeper server established. Refetching master data");
                     if (masterDataGatherer != null) {
                         masterDataGatherer.restart();
                     }
@@ -139,14 +139,14 @@ public class ZooKeeperDatabase extends Database {
         createNode(zooKeeperRoot, "published_state_bundle", new byte[0]); // TODO dedupe string constants
         byte val[] = String.valueOf(nodeIndex).getBytes(utf8);
         deleteNodeIfExists(getMyIndexPath());
-        log.log(LogLevel.INFO, "Fleetcontroller " + nodeIndex +
+        log.log(Level.INFO, "Fleetcontroller " + nodeIndex +
                 ": Creating ephemeral master vote node with vote to self.");
         session.create(getMyIndexPath(), val, acl, CreateMode.EPHEMERAL);
     }
 
     private void deleteNodeIfExists(String path) throws KeeperException, InterruptedException {
         if (session.exists(path, false) != null) {
-            log.log(LogLevel.INFO, "Fleetcontroller " + nodeIndex + ": Removing master vote node.");
+            log.log(Level.INFO, "Fleetcontroller " + nodeIndex + ": Removing master vote node.");
             session.delete(path, -1);
         }
     }
@@ -187,7 +187,7 @@ public class ZooKeeperDatabase extends Database {
         byte val[] = String.valueOf(wantedMasterIndex).getBytes(utf8);
         try{
             session.setData(getMyIndexPath(), val, -1);
-            log.log(LogLevel.INFO, "Fleetcontroller " + nodeIndex + ": Stored new vote in ephemeral node. " + nodeIndex + " -> " + wantedMasterIndex);
+            log.log(Level.INFO, "Fleetcontroller " + nodeIndex + ": Stored new vote in ephemeral node. " + nodeIndex + " -> " + wantedMasterIndex);
             return true;
         } catch (InterruptedException e) {
             throw (InterruptedException) new InterruptedException("Interrupted").initCause(e);
@@ -199,7 +199,7 @@ public class ZooKeeperDatabase extends Database {
     public boolean storeLatestSystemStateVersion(int version) throws InterruptedException {
         byte data[] = Integer.toString(version).getBytes(utf8);
         try{
-            log.log(LogLevel.INFO, String.format("Fleetcontroller %d: Storing new cluster state version in ZooKeeper: %d", nodeIndex, version));
+            log.log(Level.INFO, String.format("Fleetcontroller %d: Storing new cluster state version in ZooKeeper: %d", nodeIndex, version));
             var stat = session.setData(zooKeeperRoot + "latestversion", data, lastKnownStateVersionZNodeVersion);
             lastKnownStateVersionZNodeVersion = stat.getVersion();
             return true;
@@ -222,7 +222,7 @@ public class ZooKeeperDatabase extends Database {
             byte[] data = session.getData(zooKeeperRoot + "latestversion", false, stat);
             lastKnownStateVersionZNodeVersion = stat.getVersion();
             final Integer versionNumber = Integer.valueOf(new String(data, utf8));
-            log.log(LogLevel.INFO, String.format("Fleetcontroller %d: Read cluster state version %d from ZooKeeper " +
+            log.log(Level.INFO, String.format("Fleetcontroller %d: Read cluster state version %d from ZooKeeper " +
                     "(znode version %d)", nodeIndex, versionNumber, stat.getVersion()));
             return versionNumber;
         } catch (InterruptedException e) {
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/RpcServer.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/RpcServer.java
index e3ae95b0abe..c12f906fe09 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/RpcServer.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/RpcServer.java
@@ -112,7 +112,7 @@ public class RpcServer {
         SlobrokList slist = new SlobrokList();
         slist.setup(slobrokConnectionSpecs);
         Spec spec = new Spec(HostName.getLocalhost(), acceptor.port());
-        log.log(LogLevel.INFO, "Registering " + spec + " with slobrok at " + slobroks);
+        log.log(Level.INFO, "Registering " + spec + " with slobrok at " + slobroks);
         if (slobrokBackOffPolicy != null) {
             register = new Register(supervisor, slist, spec, slobrokBackOffPolicy);
         } else {
@@ -301,7 +301,7 @@ public class RpcServer {
                     req.returnValues().add(new StringValue(message));
                     req.returnRequest();
                     if (nodeState.getState() == State.UP && node.getPrematureCrashCount() > 0) {
-                        log.log(LogLevel.INFO, "Clearing premature crash count of " + node.getPrematureCrashCount() + " as wanted state was set to up");
+                        log.log(Level.INFO, "Clearing premature crash count of " + node.getPrematureCrashCount() + " as wanted state was set to up");
                         node.setPrematureCrashCount(0);
                     }
                 }
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 19181f2d1eb..8b3bec1b2cf 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
@@ -83,7 +83,7 @@ public class StatusPageServer implements Runnable, StatusPageServerInterface {
                 Thread.sleep(10);
             }
             if (!isConnected()) {
-                log.log(LogLevel.INFO, "Fleetcontroller: Server Socket not ready after connect()");
+                log.log(Level.INFO, "Fleetcontroller: Server Socket not ready after connect()");
             }
             log.log(Level.FINE, "Fleet controller status page viewer listening to " + ssocket.getLocalSocketAddress());
             monitor.notifyAll();
@@ -102,7 +102,7 @@ public class StatusPageServer implements Runnable, StatusPageServerInterface {
     public void setPort(int port) throws java.io.IOException, InterruptedException {
             // Only bother to reconnect if we were connected to begin with, we care about what port it runs on, and it's not already running there
         if (port != 0 && isConnected() && port != ((InetSocketAddress) ssocket.getLocalSocketAddress()).getPort()) {
-            log.log(LogLevel.INFO, "Exchanging port used by status server. Moving from port "
+            log.log(Level.INFO, "Exchanging port used by status server. Moving from port "
                     + ((InetSocketAddress) ssocket.getLocalSocketAddress()).getPort() + " to port " + port);
             disconnect();
             this.port = port;
@@ -250,7 +250,7 @@ public class StatusPageServer implements Runnable, StatusPageServerInterface {
                     if (connection != null) try{
                         connection.close();
                     } catch (IOException e) {
-                        log.log(LogLevel.INFO, "Failed to close socket " + connection + ": " + e.getMessage());
+                        log.log(Level.INFO, "Failed to close socket " + connection + ": " + e.getMessage());
                     }
                 }
             }
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java
index 6d8afa14f3e..fa2eb80506e 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java
@@ -299,7 +299,7 @@ public abstract class FleetControllerTest implements Waiter {
 
     protected void tearDownSystem() throws Exception {
         if (testName != null) {
-            //log.log(LogLevel.INFO, "STOPPING TEST " + testName);
+            //log.log(Level.INFO, "STOPPING TEST " + testName);
             System.err.println("STOPPING TEST " + testName);
             testName = null;
         }
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/MasterElectionTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/MasterElectionTest.java
index c7f25864341..557765ca761 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/MasterElectionTest.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/MasterElectionTest.java
@@ -119,18 +119,18 @@ public class MasterElectionTest extends FleetControllerTest {
     @Ignore
     public void testMasterElection() throws Exception {
         startingTest("MasterElectionTest::testMasterElection");
-        log.log(LogLevel.INFO, "STARTING TEST: MasterElectionTest::testMasterElection()");
+        log.log(Level.INFO, "STARTING TEST: MasterElectionTest::testMasterElection()");
         FleetControllerOptions options = defaultOptions("mycluster");
         options.masterZooKeeperCooldownPeriod = 1;
         setUpFleetController(5, false, options);
         waitForMaster(0);
-        log.log(LogLevel.INFO, "SHUTTING DOWN FLEET CONTROLLER 0");
+        log.log(Level.INFO, "SHUTTING DOWN FLEET CONTROLLER 0");
         fleetControllers.get(0).shutdown();
         waitForMaster(1);
-        log.log(LogLevel.INFO, "SHUTTING DOWN FLEET CONTROLLER 1");
+        log.log(Level.INFO, "SHUTTING DOWN FLEET CONTROLLER 1");
         fleetControllers.get(1).shutdown();
         waitForMaster(2);
-        log.log(LogLevel.INFO, "SHUTTING DOWN FLEET CONTROLLER 2");
+        log.log(Level.INFO, "SHUTTING DOWN FLEET CONTROLLER 2");
         fleetControllers.get(2).shutdown();
 
             // Too few for there to be a master at this point
@@ -139,23 +139,23 @@ public class MasterElectionTest extends FleetControllerTest {
             assertFalse("Fleet controller " + i, fleetControllers.get(i).isMaster());
         }
 
-        log.log(LogLevel.INFO, "STARTING FLEET CONTROLLER 2");
+        log.log(Level.INFO, "STARTING FLEET CONTROLLER 2");
         fleetControllers.set(2, createFleetController(usingFakeTimer, fleetControllers.get(2).getOptions(), true, null));
         waitForMaster(2);
-        log.log(LogLevel.INFO, "STARTING FLEET CONTROLLER 0");
+        log.log(Level.INFO, "STARTING FLEET CONTROLLER 0");
         fleetControllers.set(0, createFleetController(usingFakeTimer, fleetControllers.get(0).getOptions(), true, null));
         waitForMaster(0);
-        log.log(LogLevel.INFO, "STARTING FLEET CONTROLLER 1");
+        log.log(Level.INFO, "STARTING FLEET CONTROLLER 1");
         fleetControllers.set(1, createFleetController(usingFakeTimer, fleetControllers.get(1).getOptions(), true, null));
         waitForMaster(0);
 
-        log.log(LogLevel.INFO, "SHUTTING DOWN FLEET CONTROLLER 4");
+        log.log(Level.INFO, "SHUTTING DOWN FLEET CONTROLLER 4");
         fleetControllers.get(4).shutdown();
         waitForMaster(0);
-        log.log(LogLevel.INFO, "SHUTTING DOWN FLEET CONTROLLER 3");
+        log.log(Level.INFO, "SHUTTING DOWN FLEET CONTROLLER 3");
         fleetControllers.get(3).shutdown();
         waitForMaster(0);
-        log.log(LogLevel.INFO, "SHUTTING DOWN FLEET CONTROLLER 2");
+        log.log(Level.INFO, "SHUTTING DOWN FLEET CONTROLLER 2");
         fleetControllers.get(2).shutdown();
 
         // Too few for there to be a master at this point
@@ -166,20 +166,20 @@ public class MasterElectionTest extends FleetControllerTest {
     }
 
     private void waitForMaster(int master) {
-        log.log(LogLevel.INFO, "Entering waitForMaster");
+        log.log(Level.INFO, "Entering waitForMaster");
         boolean isOnlyMaster = false;
         for (int i=0; i < FleetControllerTest.timeoutMS; i+=100) {
             if (!fleetControllers.get(master).isMaster()) {
-                log.log(LogLevel.INFO, "Node " + master + " is not master yet, sleeping more");
+                log.log(Level.INFO, "Node " + master + " is not master yet, sleeping more");
                 timer.advanceTime(100);
                 waitForCompleteCycle(master);
             } else {
-                log.log(LogLevel.INFO, "Node " + master + " is master. Checking that noone else is master");
+                log.log(Level.INFO, "Node " + master + " is master. Checking that noone else is master");
                 isOnlyMaster = true;
                 for (int j=0; j<fleetControllers.size(); ++j) {
                     if (j != master && fleetControllers.get(j).isMaster()) {
                         isOnlyMaster = false;
-                        log.log(LogLevel.INFO, "Node " + j + " also says it is master.");
+                        log.log(Level.INFO, "Node " + j + " also says it is master.");
                     }
                 }
 
@@ -192,11 +192,11 @@ public class MasterElectionTest extends FleetControllerTest {
         }
 
         if (!isOnlyMaster) {
-            log.log(LogLevel.INFO, "Node " + master + " is not the only master");
+            log.log(Level.INFO, "Node " + master + " is not the only master");
             throw new IllegalStateException("Node " + master + " never got to be the only master.");
         }
 
-        log.log(LogLevel.INFO, "Leaving waitForMaster");
+        log.log(Level.INFO, "Leaving waitForMaster");
     }
 
     private static class StrictlyIncreasingVersionChecker {
@@ -264,9 +264,9 @@ public class MasterElectionTest extends FleetControllerTest {
         zooKeeperServer = ZooKeeperTestServer.createWithFixedPort(18342);
         timer.advanceTime(10 * 1000); // Wait long enough for fleetcontroller wanting to retry zookeeper connection
 
-        log.log(LogLevel.INFO, "WAITING FOR 0 TO BE MASTER");
+        log.log(Level.INFO, "WAITING FOR 0 TO BE MASTER");
         waitForMaster(0);
-        log.log(LogLevel.INFO, "SHUTTING DOWN");
+        log.log(Level.INFO, "SHUTTING DOWN");
     }
 
     @Test
@@ -278,28 +278,28 @@ public class MasterElectionTest extends FleetControllerTest {
         setUpFleetController(5, false, options);
         waitForMaster(0);
 
-        log.log(LogLevel.INFO, "STOPPING ZOOKEEPER SERVER AT " + zooKeeperServer.getAddress());
+        log.log(Level.INFO, "STOPPING ZOOKEEPER SERVER AT " + zooKeeperServer.getAddress());
         zooKeeperServer.shutdown(true);
         waitForCompleteCycles();
         timer.advanceTime(options.zooKeeperSessionTimeout);
         waitForZookeeperDisconnected();
         // Noone can be master if server is unavailable
-        log.log(LogLevel.INFO, "Checking master status");
+        log.log(Level.INFO, "Checking master status");
         for (int i=0; i<fleetControllers.size(); ++i) {
             assertFalse("Index " + i, fleetControllers.get(i).isMaster());
         }
 
         zooKeeperServer = new ZooKeeperTestServer();
-        log.log(LogLevel.INFO, "STARTED ZOOKEEPER SERVER AT " + zooKeeperServer.getAddress());
+        log.log(Level.INFO, "STARTED ZOOKEEPER SERVER AT " + zooKeeperServer.getAddress());
         for (FleetController fc : fleetControllers) {
             FleetControllerOptions myoptions = fc.getOptions();
             myoptions.zooKeeperServerAddress = zooKeeperServer.getAddress();
             fc.updateOptions(myoptions, 0);
-            log.log(LogLevel.INFO, "Should now have sent out new zookeeper server address " + myoptions.zooKeeperServerAddress + " to fleetcontroller " + myoptions.fleetControllerIndex);
+            log.log(Level.INFO, "Should now have sent out new zookeeper server address " + myoptions.zooKeeperServerAddress + " to fleetcontroller " + myoptions.fleetControllerIndex);
         }
         timer.advanceTime(10 * 1000); // Wait long enough for fleetcontroller wanting to retry zookeeper connection
         waitForMaster(0);
-        log.log(LogLevel.INFO, "SHUTTING DOWN");
+        log.log(Level.INFO, "SHUTTING DOWN");
     }
 
     /** Ignored for unknown reasons */
@@ -313,7 +313,7 @@ public class MasterElectionTest extends FleetControllerTest {
         waitForMaster(0);
         timer.advanceTime(24 * 3600 * 1000); // A day
         waitForCompleteCycle(1);
-        log.log(LogLevel.INFO, "SHUTTING DOWN FLEET CONTROLLER 0");
+        log.log(Level.INFO, "SHUTTING DOWN FLEET CONTROLLER 0");
         fleetControllers.get(0).shutdown();
         waitForCompleteCycle(1);
         // 5 minutes is not long enough period to wait before letting this node be master.
@@ -381,7 +381,7 @@ public class MasterElectionTest extends FleetControllerTest {
             assertEquals(req.toString(), "All 3 nodes agree that 0 is current master.", req.returnValues().get(1).asString());
         }
 
-        log.log(LogLevel.INFO, "SHUTTING DOWN FLEET CONTROLLER 0");
+        log.log(Level.INFO, "SHUTTING DOWN FLEET CONTROLLER 0");
         fleetControllers.get(0).shutdown();
             // Wait until fc 1 & 2 votes for node 1
         waitForCompleteCycle(1);
@@ -439,7 +439,7 @@ public class MasterElectionTest extends FleetControllerTest {
             fleetControllers.get(i).updateOptions(nodeOptions, 2);
         }
         waitForMaster(0);
-        log.log(LogLevel.INFO, "SHUTTING DOWN FLEET CONTROLLER 0");
+        log.log(Level.INFO, "SHUTTING DOWN FLEET CONTROLLER 0");
         fleetControllers.get(0).shutdown();
         waitForMaster(1);
     }
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/RpcServerTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/RpcServerTest.java
index 07d86459c0f..73879d3d159 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/RpcServerTest.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/RpcServerTest.java
@@ -101,7 +101,7 @@ public class RpcServerTest extends FleetControllerTest {
         waitForStableSystem();
 
         assertEquals(true, nodes.get(0).isDistributor());
-        log.log(LogLevel.INFO, "Disconnecting distributor 0. Waiting for state to reflect change.");
+        log.log(Level.INFO, "Disconnecting distributor 0. Waiting for state to reflect change.");
         nodes.get(0).disconnect();
         nodes.get(19).disconnect();
         fleetController.waitForNodesInSlobrok(9, 9, timeoutMS);
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/SlobrokTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/SlobrokTest.java
index ecdbdaeb7ce..5a96af90d68 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/SlobrokTest.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/SlobrokTest.java
@@ -45,19 +45,19 @@ public class SlobrokTest extends FleetControllerTest {
 
             // Test that we survive some slobrok instability without changing system state.
         for (int j=0; j<4; ++j) {
-            log.log(LogLevel.INFO, "Mirror updateForDistributor count is " + fleetController.getSlobrokMirrorUpdates());
-            log.log(LogLevel.INFO, "STOPPING SLOBROK SERVER (" + (j+1) + "/4)");
+            log.log(Level.INFO, "Mirror updateForDistributor count is " + fleetController.getSlobrokMirrorUpdates());
+            log.log(Level.INFO, "STOPPING SLOBROK SERVER (" + (j+1) + "/4)");
             slobrok.stop();
             for (int i=0; i<10; ++i) {
                     // Force one node to at least notice that the slobrok server is gone
                 if (i == 5) {
-                    log.log(LogLevel.INFO, "Forcing one node to initate a resend: " + nodes.get(3));
+                    log.log(Level.INFO, "Forcing one node to initate a resend: " + nodes.get(3));
                     nodes.get(3).replyToPendingNodeStateRequests();
                 }
                 waitForCompleteCycle();
                 timer.advanceTime(100);
             }
-            log.log(LogLevel.INFO, "STARTING SLOBROK SERVER AGAIN (" + (j+1) + "/4)");
+            log.log(Level.INFO, "STARTING SLOBROK SERVER AGAIN (" + (j+1) + "/4)");
             slobrok = new Slobrok(slobrokPort);
                 // May take up to 30 seconds for slobrok clients to re-register. Trigger retry.
             for (DummyVdsNode node : nodes) {
@@ -68,7 +68,7 @@ public class SlobrokTest extends FleetControllerTest {
             waitForCompleteCycle();
             fleetController.waitForNodesInSlobrok(10, 10, timeoutMS);
 
-            log.log(LogLevel.INFO, "Waiting for cluster to be up and available again");
+            log.log(Level.INFO, "Waiting for cluster to be up and available again");
             for (int i = 0; i < timeoutMS; i += 10) {
                 if (clusterAvailable()) break;
                 timer.advanceTime(1000);
@@ -96,7 +96,7 @@ public class SlobrokTest extends FleetControllerTest {
 
         int version = fleetController.getSystemState().getVersion();
         nodes.get(0).disconnectSlobrok();
-        log.log(LogLevel.INFO, "DISCONNECTED NODE FROM SLOBROK. SHOULD BE IN COOLDOWN PERIOD");
+        log.log(Level.INFO, "DISCONNECTED NODE FROM SLOBROK. SHOULD BE IN COOLDOWN PERIOD");
         fleetController.waitForNodesInSlobrok(9, 10, timeoutMS);
         synchronized (timer) {
             nodes.get(0).sendGetNodeStateReply(0);
@@ -106,7 +106,7 @@ public class SlobrokTest extends FleetControllerTest {
         timer.advanceTime(1000);
         try{ Thread.sleep(10); } catch (InterruptedException e) {}
         assertEquals(version, fleetController.getSystemState().getVersion());
-        log.log(LogLevel.INFO, "JUMPING TIME. NODE SHOULD BE MARKED DOWN");
+        log.log(Level.INFO, "JUMPING TIME. NODE SHOULD BE MARKED DOWN");
         // At this point the fleetcontroller might not have noticed that the node is out of slobrok yet.
         // Thus we keep advancing time another minute such that it should get down.
         timer.advanceTime(options.nodeStateRequestTimeoutMS + options.maxSlobrokDisconnectGracePeriod);
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/testutils/Waiter.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/testutils/Waiter.java
index 15587d6a3fb..b44edd0d209 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/testutils/Waiter.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/testutils/Waiter.java
@@ -88,7 +88,7 @@ public interface Waiter {
         }
 
         public final void wait(WaitCondition c, WaitTask wt, int timeoutMS) {
-            log.log(LogLevel.INFO, "Waiting for " + c + (wt == null ? "" : " with wait task " + wt));
+            log.log(Level.INFO, "Waiting for " + c + (wt == null ? "" : " with wait task " + wt));
             final long startTime = System.currentTimeMillis();
             final long endTime = startTime + timeoutMS;
             String lastReason = null;
@@ -96,11 +96,11 @@ public interface Waiter {
                 synchronized (data.getMonitor()) {
                     String reason = c.isConditionMet();
                     if (reason == null) {
-                        log.log(LogLevel.INFO, "Condition met. Returning");
+                        log.log(Level.INFO, "Condition met. Returning");
                         return;
                     }
                     if (lastReason == null || !lastReason.equals(reason)) {
-                        log.log(LogLevel.INFO, "Wait condition not met: " + reason);
+                        log.log(Level.INFO, "Wait condition not met: " + reason);
                         lastReason = reason;
                     }
                     try {