LogLevel.ERROR -> Level.SEVERE

40 files changed, 75 insertions, 75 deletions

diff --git a/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/ConfigserverSslContextFactoryProvider.java b/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/ConfigserverSslContextFactoryProvider.java
index a4d9ded9254..ae4a5933ac2 100644
--- a/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/ConfigserverSslContextFactoryProvider.java
+++ b/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/ConfigserverSslContextFactoryProvider.java
@@ -174,7 +174,7 @@ public class ConfigserverSslContextFactoryProvider extends TlsContextBasedProvid
                 keyManager.updateKeystore(keyStore, keystorePwd);
                 log.log(Level.INFO, "Certificate successfully updated");
             } catch (Throwable t) {
-                log.log(LogLevel.ERROR, "Failed to update certificate from ZTS: " + t.getMessage(), t);
+                log.log(Level.SEVERE, "Failed to update certificate from ZTS: " + t.getMessage(), t);
             }
         }
     }
diff --git a/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/identitydocument/IdentityDocumentResource.java b/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/identitydocument/IdentityDocumentResource.java
index b49a35f0506..cb0b1e0557f 100644
--- a/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/identitydocument/IdentityDocumentResource.java
+++ b/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/identitydocument/IdentityDocumentResource.java
@@ -43,7 +43,7 @@ public class IdentityDocumentResource implements IdentityDocumentApi {
             return EntityBindingsMapper.toSignedIdentityDocumentEntity(identityDocumentGenerator.generateSignedIdentityDocument(hostname, identityType));
         } catch (Exception e) {
             String message = String.format("Unable to generate identity doument for '%s': %s", hostname, e.getMessage());
-            log.log(LogLevel.ERROR, message, e);
+            log.log(Level.SEVERE, message, e);
             throw new InternalServerErrorException(message, e);
         }
     }
diff --git a/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/instanceconfirmation/InstanceConfirmationResource.java b/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/instanceconfirmation/InstanceConfirmationResource.java
index 2828880ff67..dbe26d3a6bb 100644
--- a/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/instanceconfirmation/InstanceConfirmationResource.java
+++ b/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/instanceconfirmation/InstanceConfirmationResource.java
@@ -34,7 +34,7 @@ public class InstanceConfirmationResource {
     public InstanceConfirmation confirmInstance(InstanceConfirmation instanceConfirmation) {
         log.log(Level.FINE, instanceConfirmation.toString());
         if (!instanceValidator.isValidInstance(instanceConfirmation)) {
-            log.log(LogLevel.ERROR, "Invalid instance: " + instanceConfirmation);
+            log.log(Level.SEVERE, "Invalid instance: " + instanceConfirmation);
             throw new ForbiddenException("Instance is invalid");
         }
         return instanceConfirmation;
diff --git a/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/instanceconfirmation/InstanceRefreshResource.java b/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/instanceconfirmation/InstanceRefreshResource.java
index a1eab136aa2..b49e03658e6 100644
--- a/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/instanceconfirmation/InstanceRefreshResource.java
+++ b/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/instanceconfirmation/InstanceRefreshResource.java
@@ -36,7 +36,7 @@ public class InstanceRefreshResource {
     public InstanceConfirmation confirmInstanceRefresh(InstanceConfirmation instanceConfirmation) {
         log.log(Level.FINE, instanceConfirmation.toString());
         if (!instanceValidator.isValidRefresh(instanceConfirmation)) {
-            log.log(LogLevel.ERROR, "Invalid instance refresh: " + instanceConfirmation);
+            log.log(Level.SEVERE, "Invalid instance refresh: " + instanceConfirmation);
             throw new ForbiddenException("Instance is invalid");
         }
         return instanceConfirmation;
diff --git a/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/instanceconfirmation/InstanceValidator.java b/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/instanceconfirmation/InstanceValidator.java
index cfc63df4a92..05bbd790ad7 100644
--- a/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/instanceconfirmation/InstanceValidator.java
+++ b/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/instanceconfirmation/InstanceValidator.java
@@ -92,7 +92,7 @@ public class InstanceValidator {
             log.log(Level.FINE, () -> String.format("Instance %s is valid.", providerUniqueId));
             return true;
         }
-        log.log(LogLevel.ERROR, () -> String.format("Instance %s has invalid signature.", providerUniqueId));
+        log.log(Level.SEVERE, () -> String.format("Instance %s has invalid signature.", providerUniqueId));
         return false;
     }
 
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 b9c839c3b87..658dd10f7e5 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
@@ -652,7 +652,7 @@ public class FleetController implements NodeStateOrHostInfoChangeHandler, NodeAd
         try {
             propagateOptions();
         } catch (Exception e) {
-            log.log(LogLevel.ERROR, "Failed to handle new fleet controller config", e);
+            log.log(Level.SEVERE, "Failed to handle new fleet controller config", e);
         }
     }
 
@@ -1070,7 +1070,7 @@ public class FleetController implements NodeStateOrHostInfoChangeHandler, NodeAd
             log.log(Level.FINE, "Event thread stopped by interrupt exception: " + e);
         } catch (Throwable t) {
             t.printStackTrace();
-            log.log(LogLevel.ERROR, "Fatal error killed fleet controller", t);
+            log.log(Level.SEVERE, "Fatal error killed fleet controller", t);
             synchronized (monitor) { running.set(false); }
             System.exit(1);
         } finally {
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 75dfb90d059..cd5202c89b2 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
@@ -121,7 +121,7 @@ public class MasterDataGatherer {
                     if (nextMasterData.containsKey(index)) {
                         nextMasterData.remove(index);
                     } else {
-                        log.log(LogLevel.ERROR, "Fleetcontroller " + nodeIndex + ": Strangely, we already had data from node " + index + " when trying to remove it");
+                        log.log(Level.SEVERE, "Fleetcontroller " + nodeIndex + ": Strangely, we already had data from node " + index + " when trying to remove it");
                     }
                 } else {
                     Integer value = Integer.valueOf(data);
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DummyVdsNode.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DummyVdsNode.java
index a596df164af..0cf84cfe54c 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DummyVdsNode.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/DummyVdsNode.java
@@ -468,7 +468,7 @@ public class DummyVdsNode {
                 }
             }
         } catch (Exception e) {
-            log.log(LogLevel.ERROR, "Dummy node " + this + ": An error occurred when answering " + req.methodName() + " request: " + e.getMessage());
+            log.log(Level.SEVERE, "Dummy node " + this + ": An error occurred when answering " + req.methodName() + " request: " + e.getMessage());
             e.printStackTrace(System.err);
             req.setError(ErrorCode.METHOD_FAILED, e.getMessage());
         }
@@ -528,7 +528,7 @@ public class DummyVdsNode {
             req.returnValues().add(new StringValue("OK"));
             log.log(Level.FINE, "Dummy node " + this + ": Got new system state (through old setsystemstate call) " + newState);
         } catch (Exception e) {
-            log.log(LogLevel.ERROR, "Dummy node " + this + ": An error occurred when answering setsystemstate request: " + e.getMessage());
+            log.log(Level.SEVERE, "Dummy node " + this + ": An error occurred when answering setsystemstate request: " + e.getMessage());
             e.printStackTrace(System.err);
             req.returnValues().add(new Int32Value(ErrorCode.METHOD_FAILED));
             req.returnValues().add(new StringValue(e.getMessage()));
@@ -552,7 +552,7 @@ public class DummyVdsNode {
             }
             log.log(Level.FINE, "Dummy node " + this + ": Got new system state " + newState);
         } catch (Exception e) {
-            log.log(LogLevel.ERROR, "Dummy node " + this + ": An error occurred when answering setsystemstate request: " + e.getMessage());
+            log.log(Level.SEVERE, "Dummy node " + this + ": An error occurred when answering setsystemstate request: " + e.getMessage());
             e.printStackTrace(System.err);
             req.setError(ErrorCode.METHOD_FAILED, e.getMessage());
         }
@@ -575,7 +575,7 @@ public class DummyVdsNode {
             }
             log.log(Level.FINE, "Dummy node " + this + ": Got new cluster state " + stateBundle);
         } catch (Exception e) {
-            log.log(LogLevel.ERROR, "Dummy node " + this + ": An error occurred when answering setdistributionstates request: " + e.getMessage());
+            log.log(Level.SEVERE, "Dummy node " + this + ": An error occurred when answering setdistributionstates request: " + e.getMessage());
             e.printStackTrace(System.err);
             req.setError(ErrorCode.METHOD_FAILED, e.getMessage());
         }
@@ -602,7 +602,7 @@ public class DummyVdsNode {
             }
             log.log(Level.FINE, "Dummy node " + this + ": Activating cluster state version " + activateVersion);
         } catch (Exception e) {
-            log.log(LogLevel.ERROR, "Dummy node " + this + ": An error occurred when answering activate_cluster_state_version request: " + e.getMessage());
+            log.log(Level.SEVERE, "Dummy node " + this + ": An error occurred when answering activate_cluster_state_version request: " + e.getMessage());
             e.printStackTrace(System.err);
             req.setError(ErrorCode.METHOD_FAILED, e.getMessage());
         }
diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/UrlDownloadRpcServer.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/UrlDownloadRpcServer.java
index 21baf873f6d..d51144a5715 100644
--- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/UrlDownloadRpcServer.java
+++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/filedistribution/UrlDownloadRpcServer.java
@@ -87,12 +87,12 @@ class UrlDownloadRpcServer {
                 req.returnValues().add(new StringValue(new File(downloadDir, CONTENTS_FILE_NAME).getAbsolutePath()));
 
             } else {
-                log.log(LogLevel.ERROR, "Download of URL '" + url + "' got server response: " + connection.getResponseCode());
+                log.log(Level.SEVERE, "Download of URL '" + url + "' got server response: " + connection.getResponseCode());
                 req.setError(HTTP_ERROR, String.valueOf(connection.getResponseCode()));
             }
 
         } catch (Throwable e) {
-            log.log(LogLevel.ERROR, "Download of URL '" + url + "' got exception: " + e.getMessage());
+            log.log(Level.SEVERE, "Download of URL '" + url + "' got exception: " + e.getMessage());
             req.setError(INTERNAL_ERROR, "Download of URL '" + url + "' internal error: " + e.getMessage());
         }
         req.returnRequest();
@@ -115,7 +115,7 @@ class UrlDownloadRpcServer {
                     log.log(Level.INFO, String.format("Download of URL '%s' done in %.3f seconds",
                                                          url, (System.currentTimeMillis() -start) / 1000.0));
                 } else {
-                    log.log(LogLevel.ERROR, "Downloaded URL '" + url + "' not found, returning error");
+                    log.log(Level.SEVERE, "Downloaded URL '" + url + "' not found, returning error");
                     req.setError(DOES_NOT_EXIST, "Downloaded '" + url + "' not found");
                 }
             }
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/ConfigServerBootstrap.java b/configserver/src/main/java/com/yahoo/vespa/config/server/ConfigServerBootstrap.java
index 36767e6fc5f..d628702758b 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/ConfigServerBootstrap.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/ConfigServerBootstrap.java
@@ -139,7 +139,7 @@ public class ConfigServerBootstrap extends AbstractComponent implements Runnable
             try {
                 Thread.sleep(1000);
             } catch (InterruptedException e) {
-                log.log(LogLevel.ERROR, "Got interrupted", e);
+                log.log(Level.SEVERE, "Got interrupted", e);
                 break;
             }
         } while (server.isRunning());
@@ -158,7 +158,7 @@ public class ConfigServerBootstrap extends AbstractComponent implements Runnable
                 versionState.saveNewVersion();
                 log.log(Level.INFO, "All applications redeployed successfully");
             } catch (Exception e) {
-                log.log(LogLevel.ERROR, "Redeployment of applications failed", e);
+                log.log(Level.SEVERE, "Redeployment of applications failed", e);
                 redeployingApplicationsFailed();
                 return; // Status will not be set to 'up' since we return here
             }
@@ -193,7 +193,7 @@ public class ConfigServerBootstrap extends AbstractComponent implements Runnable
             try {
                 Thread.sleep(10);
             } catch (InterruptedException e) {
-                log.log(LogLevel.ERROR, "Got interrupted", e);
+                log.log(Level.SEVERE, "Got interrupted", e);
                 break;
             }
         }
@@ -218,7 +218,7 @@ public class ConfigServerBootstrap extends AbstractComponent implements Runnable
         } while ( ! applicationsNotRedeployed.isEmpty() && Instant.now().isBefore(end));
 
         if ( ! applicationsNotRedeployed.isEmpty()) {
-            log.log(LogLevel.ERROR, "Redeploying applications not finished after " + maxDurationOfRedeployment +
+            log.log(Level.SEVERE, "Redeploying applications not finished after " + maxDurationOfRedeployment +
                     ", exiting, applications that failed redeployment: " + applicationsNotRedeployed);
             return false;
         }
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/ConfigServerDB.java b/configserver/src/main/java/com/yahoo/vespa/config/server/ConfigServerDB.java
index 6cf0ad5fab7..c788b73720d 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/ConfigServerDB.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/ConfigServerDB.java
@@ -35,7 +35,7 @@ public class ConfigServerDB {
         try {
             initialize(configserverConfig.configModelPluginDir());
         } catch (IllegalArgumentException e) {
-            log.log(LogLevel.ERROR, "Error initializing serverdb: " + e.getMessage());
+            log.log(Level.SEVERE, "Error initializing serverdb: " + e.getMessage());
         } catch (IOException e) {
             throw new RuntimeException("Unable to initialize server db", e);
         }
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDirectory.java b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDirectory.java
index cfa648ce351..9f65c0e3c6e 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDirectory.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDirectory.java
@@ -119,7 +119,7 @@ public class FileDirectory  {
 
         File existingFile = destinationDir.toPath().resolve(source.getName()).toFile();
         if ( ! existingFile.exists() || ! computeHash(existingFile).equals(hashOfFileToBeAdded)) {
-            log.log(LogLevel.ERROR, "Directory for file reference '" + fileReference.value() +
+            log.log(Level.SEVERE, "Directory for file reference '" + fileReference.value() +
                     "' has content that does not match its hash, deleting everything in " +
                     destinationDir.getAbsolutePath());
             IOUtils.recursiveDeleteDir(destinationDir);
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionActiveHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionActiveHandler.java
index 5289092e9ce..4cf59135026 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionActiveHandler.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionActiveHandler.java
@@ -55,7 +55,7 @@ public class SessionActiveHandler extends SessionHandler {
     // Overridden to make sure we are logging when this low-level handling of timeout happens
     @Override
     public void handleTimeout(Request request, ResponseHandler responseHandler) {
-        log.log(LogLevel.ERROR, "activate timed out for " + request.getUri(), new RuntimeException("activate timed out"));
+        log.log(Level.SEVERE, "activate timed out for " + request.getUri(), new RuntimeException("activate timed out"));
         super.handleTimeout(request, responseHandler);
     }
 
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ModelsBuilder.java b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ModelsBuilder.java
index ebb399076ad..6c6b352361f 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ModelsBuilder.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ModelsBuilder.java
@@ -199,7 +199,7 @@ public abstract class ModelsBuilder<MODELRESULT extends ModelResult> {
                 if (allApplicationVersions.size() > 0 && allApplicationVersions.get(0).getModel().skipOldConfigModels(now))
                     log.log(Level.INFO, applicationId + ": Skipping old version (due to validation override)");
                 else {
-                    log.log(LogLevel.ERROR, applicationId + ": Failed to build version " + version);
+                    log.log(Level.SEVERE, applicationId + ": Failed to build version " + version);
                     throw e;
                 }
             }
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ConfigCurator.java b/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ConfigCurator.java
index 748223b13a3..d0668772748 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ConfigCurator.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ConfigCurator.java
@@ -310,7 +310,7 @@ public class ConfigCurator {
             curator.framework().checkExists().forPath("/dummy");
         }
         catch (Exception e) {
-            log.log(LogLevel.ERROR, "Unable to contact ZooKeeper on " + curator.connectionSpec() +
+            log.log(Level.SEVERE, "Unable to contact ZooKeeper on " + curator.connectionSpec() +
                     ". Please verify for all configserver nodes that " +
                     "VESPA_CONFIGSERVERS points to the correct configserver(s), " +
                     "the same configserver(s) as in services.xml, and that they are started. " +
diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java b/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java
index 2b4c1489313..164a27dbf54 100644
--- a/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java
+++ b/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java
@@ -83,7 +83,7 @@ public abstract class ThreadedHttpRequestHandler extends ThreadedRequestHandler
         } catch (Exception e) {
             metric.add(UNHANDLED_EXCEPTIONS_METRIC, 1L, contextFor(request, Map.of("exception", e.getClass().getSimpleName())));
             metric.add(RENDERING_ERRORS, 1, null);
-            log.log(LogLevel.ERROR, "Uncaught exception handling request", e);
+            log.log(Level.SEVERE, "Uncaught exception handling request", e);
             if (channel != null) {
                 channel.setHttpResponse(null);
                 channel.close(null);
diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java b/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java
index f7e03a2098e..2a72d0b3442 100644
--- a/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java
+++ b/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java
@@ -210,7 +210,7 @@ public final class ConfiguredApplication implements Application {
             Container.get().setupFileAcquirer(config.filedistributor());
             Container.get().setupUrlDownloader();
         } catch (Exception e) {
-            log.log(LogLevel.ERROR, "Caught exception when initializing server. Exiting.", e);
+            log.log(Level.SEVERE, "Caught exception when initializing server. Exiting.", e);
             Runtime.getRuntime().halt(1);
         }
     }
diff --git a/container-search/src/main/java/com/yahoo/prelude/fastsearch/DocsumField.java b/container-search/src/main/java/com/yahoo/prelude/fastsearch/DocsumField.java
index 10ecb8604ea..ef892585d21 100644
--- a/container-search/src/main/java/com/yahoo/prelude/fastsearch/DocsumField.java
+++ b/container-search/src/main/java/com/yahoo/prelude/fastsearch/DocsumField.java
@@ -58,7 +58,7 @@ public abstract class DocsumField {
             fieldFactory.put("xmlstring", XMLField.class);
             fieldFactory.put("tensor", TensorField.class);
         } catch (Exception e) {
-            log.log(LogLevel.ERROR, "Could not initialize docsum decoding properly.", e);
+            log.log(Level.SEVERE, "Could not initialize docsum decoding properly.", e);
         }
     }
 
diff --git a/container-search/src/main/java/com/yahoo/prelude/query/parser/SpecialTokens.java b/container-search/src/main/java/com/yahoo/prelude/query/parser/SpecialTokens.java
index c24a2824b95..95a374316de 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/parser/SpecialTokens.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/parser/SpecialTokens.java
@@ -66,7 +66,7 @@ public class SpecialTokens {
         // TODO put along with the global toLowerCase
         String asHigh = token.toUpperCase(Locale.ENGLISH);
         if (asLow.length() != token.length() || asHigh.length() != token.length()) {
-            log.log(LogLevel.ERROR, "Special token '" + token + "' has case sensitive length. Ignoring the token."
+            log.log(Level.SEVERE, "Special token '" + token + "' has case sensitive length. Ignoring the token."
                     + " Please report this message in a bug to the Vespa team.");
             return false;
         } else {
diff --git a/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java b/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java
index 432b378938e..c8386f3c75c 100644
--- a/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java
+++ b/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java
@@ -485,10 +485,10 @@ public class SearchHandler extends LoggingRequestHandler {
     private void log(String request, Query query, Throwable e) {
         // Attempted workaround for missing stack traces
         if (e.getStackTrace().length == 0) {
-            log.log(LogLevel.ERROR, "Failed executing " + query.toDetailString() +
+            log.log(Level.SEVERE, "Failed executing " + query.toDetailString() +
                                     " [" + request + "], received exception with no context", e);
         } else {
-            log.log(LogLevel.ERROR, "Failed executing " + query.toDetailString() + " [" + request + "]", e);
+            log.log(Level.SEVERE, "Failed executing " + query.toDetailString() + " [" + request + "]", e);
         }
     }
 
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/CuratorDb.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/CuratorDb.java
index ef347c9be19..db0866de5b6 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/CuratorDb.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/CuratorDb.java
@@ -357,7 +357,7 @@ public class CuratorDb {
                 readApplication(id).ifPresent(applications::add);
             } catch (Exception e) {
                 if (canFail) {
-                    log.log(LogLevel.ERROR, "Failed to read application '" + id + "', this must be fixed through " +
+                    log.log(Level.SEVERE, "Failed to read application '" + id + "', this must be fixed through " +
                                             "manual intervention", e);
                 } else {
                     throw e;
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/systemflags/SystemFlagsDeployer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/systemflags/SystemFlagsDeployer.java
index 538ab36374b..5ea277f5101 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/systemflags/SystemFlagsDeployer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/systemflags/SystemFlagsDeployer.java
@@ -65,7 +65,7 @@ class SystemFlagsDeployer  {
             try {
                 results.add(future.get());
             } catch (InterruptedException | ExecutionException e) {
-                log.log(LogLevel.ERROR, String.format("Failed to deploy flags for target '%s': %s", target, e.getMessage()), e);
+                log.log(Level.SEVERE, String.format("Failed to deploy flags for target '%s': %s", target, e.getMessage()), e);
                 throw new RuntimeException(e);
             }
         });
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/systemflags/SystemFlagsHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/systemflags/SystemFlagsHandler.java
index 76c746cd6c7..43a03bf10f3 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/systemflags/SystemFlagsHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/systemflags/SystemFlagsHandler.java
@@ -66,7 +66,7 @@ public class SystemFlagsHandler extends LoggingRequestHandler {
             return new JacksonJsonResponse<>(200, result.toWire());
         } catch (Exception e) {
             String errorMessage = "System flags deploy failed: " + e.getMessage();
-            log.log(LogLevel.ERROR, errorMessage, e);
+            log.log(Level.SEVERE, errorMessage, e);
             return ErrorResponse.internalServerError(errorMessage);
         }
     }
diff --git a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java
index 3a92d005b79..eb795de89b6 100644
--- a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java
+++ b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java
@@ -345,7 +345,7 @@ public class DockerImpl implements Docker {
         @Override
         public void onError(Throwable throwable) {
             removeScheduledPoll(dockerImage);
-            logger.log(LogLevel.ERROR, "Could not download image " + dockerImage.asString(), throwable);
+            logger.log(Level.SEVERE, "Could not download image " + dockerImage.asString(), throwable);
         }
 
 
diff --git a/docproc/src/main/java/com/yahoo/docproc/jdisc/DocumentProcessingHandler.java b/docproc/src/main/java/com/yahoo/docproc/jdisc/DocumentProcessingHandler.java
index 2ebc29a6b09..335fec8c5c0 100644
--- a/docproc/src/main/java/com/yahoo/docproc/jdisc/DocumentProcessingHandler.java
+++ b/docproc/src/main/java/com/yahoo/docproc/jdisc/DocumentProcessingHandler.java
@@ -24,7 +24,6 @@ import com.yahoo.jdisc.Request;
 import com.yahoo.jdisc.handler.AbstractRequestHandler;
 import com.yahoo.jdisc.handler.ContentChannel;
 import com.yahoo.jdisc.handler.ResponseHandler;
-import java.util.logging.Level;
 import com.yahoo.messagebus.jdisc.MbusRequest;
 import com.yahoo.processing.execution.chain.ChainRegistry;
 import com.yahoo.statistics.Statistics;
@@ -33,6 +32,7 @@ import java.util.TimerTask;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Logger;
+import java.util.logging.Level;
 
 import static com.yahoo.component.chain.ChainsConfigurer.prepareChainRegistry;
 import static com.yahoo.component.chain.model.ChainsModelBuilder.buildFromConfig;
@@ -167,7 +167,7 @@ public class DocumentProcessingHandler extends AbstractRequestHandler {
         DocprocService service = docprocServiceRegistry.getComponent(serviceName);
         //No need to enqueue a task if the docproc chain is empty, just forward requestContext
         if (service == null) {
-            log.log(LogLevel.ERROR, "DocprocService for session '" + serviceName +
+            log.log(Level.SEVERE, "DocprocService for session '" + serviceName +
                                     "' not found, returning request '" + requestContext + "'.");
             requestContext.processingFailed(RequestContext.ErrorCode.ERROR_PROCESSING_FAILURE,
                                             "DocprocService " + serviceName + " not found.");
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSession.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSession.java
index b40da64df30..429c9bc0f51 100755
--- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSession.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSession.java
@@ -726,7 +726,7 @@ public class MessageBusVisitorSession implements VisitorSession {
                     } else {
                         String msg = "Received reply we do not know how to handle: " +
                                 reply.getClass().getName();
-                        log.log(LogLevel.ERROR, msg);
+                        log.log(Level.SEVERE, msg);
                         transitionTo(new StateDescription(State.FAILED, msg));
                     }
                 } catch (Exception e) {
@@ -772,7 +772,7 @@ public class MessageBusVisitorSession implements VisitorSession {
     private void handleMessageProcessingException(Reply reply, Exception e, String what) {
         final String errorDesc = formatProcessingException(e, what);
         final String fullMsg = formatIdentifyingVisitorErrorString(errorDesc);
-        log.log(LogLevel.ERROR, fullMsg, e);
+        log.log(Level.SEVERE, fullMsg, e);
         int errorCode;
         synchronized (progress.getToken()) {
             if (!params.skipBucketsOnFatalErrors()) {
@@ -841,7 +841,7 @@ public class MessageBusVisitorSession implements VisitorSession {
         msg.swapState(reply);
 
         if (params.getLocalDataHandler() == null) {
-            log.log(LogLevel.ERROR, sessionName + ": Got visitor data back to client with no local data destination.");
+            log.log(Level.SEVERE, sessionName + ": Got visitor data back to client with no local data destination.");
             reply.addError(new Error(ErrorCode.APP_FATAL_ERROR, "Visitor data with no local data destination"));
             receiver.reply(reply);
             return;
@@ -1066,7 +1066,7 @@ public class MessageBusVisitorSession implements VisitorSession {
                 progress.getIterator().setDistributionBitCount(stateBits);
             }
         } catch (Exception e) {
-            log.log(LogLevel.ERROR, "Failed to parse new system state string: "
+            log.log(Level.SEVERE, "Failed to parse new system state string: "
                     + reply.getSystemState());
             transitionTo(new StateDescription(State.FAILED, "Failed to parse cluster state '"
                     + reply.getSystemState() + "'"));
@@ -1170,7 +1170,7 @@ public class MessageBusVisitorSession implements VisitorSession {
                 sender.destroy();
                 receiver.destroy();
             } catch (Exception e) {
-                log.log(LogLevel.ERROR, "Caught exception destroying communication interfaces", e);
+                log.log(Level.SEVERE, "Caught exception destroying communication interfaces", e);
             }
             log.log(Level.FINE, sessionName + ": synchronous destroy() done");
         }
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableRepository.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableRepository.java
index c91db403cbd..7fc1ad8fc84 100755
--- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableRepository.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableRepository.java
@@ -51,11 +51,11 @@ final class RoutableRepository {
      */
     Routable decode(DocumentTypeManager docMan, Version version, byte[] data) {
         if (data == null || data.length == 0) {
-            log.log(LogLevel.ERROR, "Received empty byte array for deserialization.");
+            log.log(Level.SEVERE, "Received empty byte array for deserialization.");
             return null;
         }
         if (version.getMajor() < 5) {
-            log.log(LogLevel.ERROR,"Can not decode anything from (version " + version + "). Only major version 5 and up supported.");
+            log.log(Level.SEVERE,"Can not decode anything from (version " + version + "). Only major version 5 and up supported.");
             return null;
         }
         DocumentDeserializer in = DocumentDeserializerFactory.createHead(docMan, GrowableByteBuffer.wrap(data));
@@ -64,12 +64,12 @@ final class RoutableRepository {
         int type = in.getInt(null);
         RoutableFactory factory = getFactory(version, type);
         if (factory == null) {
-            log.log(LogLevel.ERROR,"No routable factory found for routable type " + type + " (version " + version + ").");
+            log.log(Level.SEVERE,"No routable factory found for routable type " + type + " (version " + version + ").");
             return null;
         }
         Routable ret = factory.decode(in, loadTypes);
         if (ret == null) {
-            log.log(LogLevel.ERROR,"Routable factory " + factory.getClass().getName() + " failed to deserialize " +
+            log.log(Level.SEVERE,"Routable factory " + factory.getClass().getName() + " failed to deserialize " +
                                                "routable of type " + type + " (version " + version + ").\nData = " + Arrays.toString(data));
             return null;
         }
@@ -90,18 +90,18 @@ final class RoutableRepository {
         int type = obj.getType();
         RoutableFactory factory = getFactory(version, type);
         if (factory == null) {
-            log.log(LogLevel.ERROR,"No routable factory found for routable type " + type + " (version " + version + ").");
+            log.log(Level.SEVERE,"No routable factory found for routable type " + type + " (version " + version + ").");
             return new byte[0];
         }
         if (version.getMajor() < 5) {
-            log.log(LogLevel.ERROR,"Can not encode routable type " + type + " (version " + version + "). Only major version 5 and up supported.");
+            log.log(Level.SEVERE,"Can not encode routable type " + type + " (version " + version + "). Only major version 5 and up supported.");
             return new byte[0];
         }
         DocumentSerializer out= DocumentSerializerFactory.createHead(new GrowableByteBuffer(8192));
 
         out.putInt(null, type);
         if (!factory.encode(obj, out)) {
-            log.log(LogLevel.ERROR, "Routable factory " + factory.getClass().getName() + " failed to serialize " +
+            log.log(Level.SEVERE, "Routable factory " + factory.getClass().getName() + " failed to serialize " +
                                     "routable of type " + type + " (version " + version + ").");
             return new byte[0];
         }
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutingPolicyRepository.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutingPolicyRepository.java
index 0b9498d798a..c9e3488ecb9 100755
--- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutingPolicyRepository.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutingPolicyRepository.java
@@ -49,13 +49,13 @@ class RoutingPolicyRepository {
     RoutingPolicy createPolicy(String name, String param) {
         RoutingPolicyFactory factory = getFactory(name);
         if (factory == null) {
-            log.log(LogLevel.ERROR, "No routing policy factory found for name '" + name + "'.");
+            log.log(Level.SEVERE, "No routing policy factory found for name '" + name + "'.");
             return null;
         }
         DocumentProtocolRoutingPolicy ret = factory.createPolicy(param);
 
         if (ret == null) {
-            log.log(LogLevel.ERROR, "Routing policy factory " + factory.getClass().getName() + " failed to create a " +
+            log.log(Level.SEVERE, "Routing policy factory " + factory.getClass().getName() + " failed to create a " +
                     "routing policy for parameter '" + name + "'.");
             return null;
         }
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/StoragePolicy.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/StoragePolicy.java
index 12dea1759c4..5594b9f9db4 100644
--- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/StoragePolicy.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/StoragePolicy.java
@@ -282,7 +282,7 @@ public class StoragePolicy extends SlobrokPolicy {
                 case DocumentProtocol.MESSAGE_CREATEVISITOR:       return ((CreateVisitorMessage)msg).getBuckets().get(0);
                 case DocumentProtocol.MESSAGE_REMOVELOCATION:      return ((RemoveLocationMessage)msg).getBucketId();
                 default:
-                    log.log(LogLevel.ERROR, "Message type '" + msg.getType() + "' not supported.");
+                    log.log(Level.SEVERE, "Message type '" + msg.getType() + "' not supported.");
                     return null;
             }
         }
@@ -471,7 +471,7 @@ public class StoragePolicy extends SlobrokPolicy {
             if (context.usedState == null) {
                 String msg = "Used state must be set as distributor is calculated. Bug.";
                 reply.getTrace().trace(1, msg);
-                log.log(LogLevel.ERROR, msg);
+                log.log(Level.SEVERE, msg);
             } else if (newState.getVersion() == context.usedState.getVersion()) {
                 String msg = "Message sent to distributor " + context.calculatedDistributor +
                              " retrieved cluster state version " + newState.getVersion() +
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/systemstate/rule/NodeState.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/systemstate/rule/NodeState.java
index 527c94a4d2a..d23a0e580a0 100755
--- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/systemstate/rule/NodeState.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/systemstate/rule/NodeState.java
@@ -91,7 +91,7 @@ public class NodeState {
         }
         if (arr[0].equals(NODE_PARENT)) {
             if (parent == null) {
-                log.log(LogLevel.ERROR, "Location string '" + key + "' requests a parent above the top-most node, " +
+                log.log(Level.SEVERE, "Location string '" + key + "' requests a parent above the top-most node, " +
                                         "returning self to avoid crash.");
             }
             return parent.getChild(arr[1], force);
diff --git a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReceiver.java b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReceiver.java
index b18b415931b..875058b2eff 100644
--- a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReceiver.java
+++ b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReceiver.java
@@ -80,7 +80,7 @@ public class FileReceiver {
                 inprogressFile = Files.createTempFile(tmpDirectory.toPath(), fileName, ".inprogress").toFile();
             } catch (IOException e) {
                 String msg = "Failed creating temp file for inprogress file for " + fileName + " in '" + tmpDirectory.toPath() + "': ";
-                log.log(LogLevel.ERROR, msg + e.getMessage(), e);
+                log.log(Level.SEVERE, msg + e.getMessage(), e);
                 throw new RuntimeException(msg, e);
             }
         }
@@ -96,7 +96,7 @@ public class FileReceiver {
             try {
                 Files.write(inprogressFile.toPath(), part, StandardOpenOption.WRITE, StandardOpenOption.APPEND);
             } catch (IOException e) {
-                log.log(LogLevel.ERROR, "Failed writing to file (" + inprogressFile.toPath() + "): " + e.getMessage(), e);
+                log.log(Level.SEVERE, "Failed writing to file (" + inprogressFile.toPath() + "): " + e.getMessage(), e);
                 inprogressFile.delete();
                 throw new RuntimeException("Failed writing to file (" + inprogressFile.toPath() + "): ", e);
             }
@@ -120,14 +120,14 @@ public class FileReceiver {
                     try {
                         Files.createDirectories(fileReferenceDir.toPath());
                     } catch (IOException e) {
-                        log.log(LogLevel.ERROR, "Failed creating directory (" + fileReferenceDir.toPath() + "): " + e.getMessage(), e);
+                        log.log(Level.SEVERE, "Failed creating directory (" + fileReferenceDir.toPath() + "): " + e.getMessage(), e);
                         throw new RuntimeException("Failed creating directory (" + fileReferenceDir.toPath() + "): ", e);
                     }
                     log.log(Level.FINE, () -> "Uncompressed file, moving to " + file.getAbsolutePath());
                     moveFileToDestination(inprogressFile, file);
                 }
             } catch (IOException e) {
-                log.log(LogLevel.ERROR, "Failed writing file: " + e.getMessage(), e);
+                log.log(Level.SEVERE, "Failed writing file: " + e.getMessage(), e);
                 throw new RuntimeException("Failed writing file: ", e);
             } finally {
                 try {
@@ -135,7 +135,7 @@ public class FileReceiver {
                         Files.delete(inprogressFile.toPath());
                     }
                 } catch (IOException e) {
-                    log.log(LogLevel.ERROR, "Failed deleting " + inprogressFile.getAbsolutePath() + ": " + e.getMessage(), e);
+                    log.log(Level.SEVERE, "Failed deleting " + inprogressFile.getAbsolutePath() + ": " + e.getMessage(), e);
                 }
             }
             return file;
@@ -197,7 +197,7 @@ public class FileReceiver {
             deleteFileOrDirectory(tempFile);
         } catch (IOException e) {
             String message = "Failed moving file '" + tempFile.getAbsolutePath() + "' to '" + destination.getAbsolutePath() + "'";
-            log.log(LogLevel.ERROR, message, e);
+            log.log(Level.SEVERE, message, e);
             throw new RuntimeException(message, e);
         }
     }
diff --git a/logserver/src/main/java/com/yahoo/logserver/AbstractPluginLoader.java b/logserver/src/main/java/com/yahoo/logserver/AbstractPluginLoader.java
index 4988357ee8c..f897933ebe7 100644
--- a/logserver/src/main/java/com/yahoo/logserver/AbstractPluginLoader.java
+++ b/logserver/src/main/java/com/yahoo/logserver/AbstractPluginLoader.java
@@ -24,7 +24,7 @@ public abstract class AbstractPluginLoader implements PluginLoader {
         try {
             plugin = pluginClass.getDeclaredConstructor().newInstance();
         } catch (InstantiationException | IllegalAccessException | NoSuchMethodException | InvocationTargetException e) {
-            log.log(LogLevel.ERROR, pluginClass.getName() + ": load failed: " + e);
+            log.log(Level.SEVERE, pluginClass.getName() + ": load failed: " + e);
             throw new RuntimeException(e);
         }
 
@@ -42,7 +42,7 @@ public abstract class AbstractPluginLoader implements PluginLoader {
             plugin.initPlugin(config);
             log.log(Level.FINE, pname + ": plugin loaded");
         } catch (Exception e) {
-            log.log(LogLevel.ERROR, pname + ": init failed", e);
+            log.log(Level.SEVERE, pname + ": init failed", e);
         }
     }
 }
diff --git a/logserver/src/main/java/com/yahoo/logserver/handlers/archive/ArchiverHandler.java b/logserver/src/main/java/com/yahoo/logserver/handlers/archive/ArchiverHandler.java
index ea6883cbe29..8ed6ec6de00 100644
--- a/logserver/src/main/java/com/yahoo/logserver/handlers/archive/ArchiverHandler.java
+++ b/logserver/src/main/java/com/yahoo/logserver/handlers/archive/ArchiverHandler.java
@@ -215,7 +215,7 @@ public class ArchiverHandler extends AbstractLogHandler {
             log.log(Level.FINE, "Using " + absoluteRootDir + " as root");
         } else {
             if (! root.mkdirs()) {
-                log.log(LogLevel.ERROR, "Unable to create directory " + absoluteRootDir);
+                log.log(Level.SEVERE, "Unable to create directory " + absoluteRootDir);
             } else {
                 log.log(Level.FINE, "Created root at " + absoluteRootDir);
             }
diff --git a/messagebus/src/main/java/com/yahoo/messagebus/Messenger.java b/messagebus/src/main/java/com/yahoo/messagebus/Messenger.java
index 5f2ff58f3fd..0cc8310937b 100755
--- a/messagebus/src/main/java/com/yahoo/messagebus/Messenger.java
+++ b/messagebus/src/main/java/com/yahoo/messagebus/Messenger.java
@@ -168,7 +168,7 @@ public class Messenger implements Runnable {
                 try {
                     task.run();
                 } catch (final Exception e) {
-                    log.log(LogLevel.ERROR, "An exception was thrown while running " + task.getClass().getName(), e);
+                    log.log(Level.SEVERE, "An exception was thrown while running " + task.getClass().getName(), e);
                 }
                 try {
                     task.destroy();
diff --git a/messagebus/src/main/java/com/yahoo/messagebus/ProtocolRepository.java b/messagebus/src/main/java/com/yahoo/messagebus/ProtocolRepository.java
index d875cc32b3f..d3ab41331ae 100755
--- a/messagebus/src/main/java/com/yahoo/messagebus/ProtocolRepository.java
+++ b/messagebus/src/main/java/com/yahoo/messagebus/ProtocolRepository.java
@@ -78,20 +78,20 @@ public class ProtocolRepository {
             }
             Protocol protocol = getProtocol(protocolName);
             if (protocol == null) {
-                log.log(LogLevel.ERROR, "Protocol '" + protocolName + "' not supported.");
+                log.log(Level.SEVERE, "Protocol '" + protocolName + "' not supported.");
                 return null;
             }
             try {
                 ret = protocol.createPolicy(policyName, policyParam);
             } catch (RuntimeException e) {
-                log.log(LogLevel.ERROR, "Protcol '" + protocolName + "' threw an exception: " + e.getMessage(), e);
+                log.log(Level.SEVERE, "Protcol '" + protocolName + "' threw an exception: " + e.getMessage(), e);
                 if (ret != null) {
                     ret.destroy();
                 }
                 return null;
             }
             if (ret == null) {
-                log.log(LogLevel.ERROR, "Protocol '" + protocolName + "' failed to create routing policy '" + policyName +
+                log.log(Level.SEVERE, "Protocol '" + protocolName + "' failed to create routing policy '" + policyName +
                                         "' with parameter '" + policyParam + "'.");
                 return null;
             }
diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/ConfigSentinelClient.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/ConfigSentinelClient.java
index 17a6fb234c0..c0e3e636aa6 100644
--- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/ConfigSentinelClient.java
+++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/ConfigSentinelClient.java
@@ -45,7 +45,7 @@ public class ConfigSentinelClient extends AbstractComponent {
         try {
             setStatus(services);
         } catch (Exception e) {
-            log.log(LogLevel.ERROR, "Unable to update service pids from sentinel", e);
+            log.log(Level.SEVERE, "Unable to update service pids from sentinel", e);
         }
     }
 
@@ -62,7 +62,7 @@ public class ConfigSentinelClient extends AbstractComponent {
         try {
             setStatus(services);
         } catch (Exception e) {
-            log.log(LogLevel.ERROR, "Unable to update service pids from sentinel", e);
+            log.log(Level.SEVERE, "Unable to update service pids from sentinel", e);
         }
     }
 
diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/SystemPoller.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/SystemPoller.java
index 7620e94fc9e..a6c2220b5a2 100644
--- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/SystemPoller.java
+++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/SystemPoller.java
@@ -180,7 +180,7 @@ public class SystemPoller {
         try {
             in = new BufferedReader(new FileReader("/proc/stat"));
         } catch (FileNotFoundException ex) {
-            log.log(LogLevel.ERROR, "Unable to open stat file", ex);
+            log.log(Level.SEVERE, "Unable to open stat file", ex);
             return 0;
         }
         try {
@@ -194,7 +194,7 @@ public class SystemPoller {
 
             in.close();
         } catch (IOException ex) {
-            log.log(LogLevel.ERROR, "Unable to read line from stat file", ex);
+            log.log(Level.SEVERE, "Unable to read line from stat file", ex);
             return 0;
         }
 
diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/OrchestratorContext.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/OrchestratorContext.java
index 1c5ae323d04..fbb25baa806 100644
--- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/OrchestratorContext.java
+++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/OrchestratorContext.java
@@ -153,7 +153,7 @@ public class OrchestratorContext implements AutoCloseable {
             try {
                 unlock.run();
             } catch (RuntimeException e) {
-                logger.log(LogLevel.ERROR, "Failed run on close : " + e.getMessage());
+                logger.log(Level.SEVERE, "Failed run on close : " + e.getMessage());
             }
         });
     }
diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/status/ZkStatusService.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/status/ZkStatusService.java
index a851781660a..32fdaa9433d 100644
--- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/status/ZkStatusService.java
+++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/status/ZkStatusService.java
@@ -277,7 +277,7 @@ public class ZkStatusService implements StatusService {
         try {
             lock = lockApplication(context, reference);
         } catch (RuntimeException e) {
-            log.log(LogLevel.ERROR, "Failed to get Orchestrator lock on when " + reference +
+            log.log(Level.SEVERE, "Failed to get Orchestrator lock on when " + reference +
                     eventDescription + ": " + e.getMessage());
             return;
         }
@@ -285,7 +285,7 @@ public class ZkStatusService implements StatusService {
         try (lock) {
             runnable.run();
         } catch (RuntimeException e) {
-            log.log(LogLevel.ERROR, "Failed to clean up after " + reference + eventDescription +
+            log.log(Level.SEVERE, "Failed to clean up after " + reference + eventDescription +
                     ": " + e.getMessage());
         }
     }
diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/executor/CancellableImpl.java b/service-monitor/src/main/java/com/yahoo/vespa/service/executor/CancellableImpl.java
index 4b6a654a202..cda91994443 100644
--- a/service-monitor/src/main/java/com/yahoo/vespa/service/executor/CancellableImpl.java
+++ b/service-monitor/src/main/java/com/yahoo/vespa/service/executor/CancellableImpl.java
@@ -97,7 +97,7 @@ class CancellableImpl implements Cancellable, Runnable {
             runlet.close();
             periodicExecutionCancellation.get().run();
         } catch (Throwable e) {
-            logger.log(LogLevel.ERROR, "Failed run of periodic execution", e);
+            logger.log(Level.SEVERE, "Failed run of periodic execution", e);
         }
     }
 }