summaryrefslogtreecommitdiffstats
path: root/configserver
diff options
context:
space:
mode:
authorgjoranv <gv@verizonmedia.com>2020-04-24 21:23:29 +0200
committergjoranv <gv@verizonmedia.com>2020-04-25 02:24:38 +0200
commit89fa2fd9926579e6e2b24adf4281d063ecf62c43 (patch)
treef9ca3acb395abc65a06b5ad6baf2516646b7f940 /configserver
parentd588f01d40105a13129b8e007a7f65231a6e1ca5 (diff)
Replace remaining LogLevel.<level> with corresponding Level
Diffstat (limited to 'configserver')
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/deploy/DeployHandlerLogger.java2
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/rpc/GetConfigProcessor.java2
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/session/LocalSessionStateWatcher.java2
-rw-r--r--configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java2
4 files changed, 4 insertions, 4 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/DeployHandlerLogger.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/DeployHandlerLogger.java
index f45e2cf6285..ced73cda6fb 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/DeployHandlerLogger.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/DeployHandlerLogger.java
@@ -33,7 +33,7 @@ public class DeployHandlerLogger implements DeployLogger {
@Override
public void log(Level level, String message) {
- if ((level == LogLevel.FINE ||
+ if ((level == Level.FINE ||
level == Level.FINE ||
level == Level.FINEST) &&
!verbose) {
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/GetConfigProcessor.java b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/GetConfigProcessor.java
index cf6890e22d2..7809000695a 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/GetConfigProcessor.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/GetConfigProcessor.java
@@ -49,7 +49,7 @@ class GetConfigProcessor implements Runnable {
private void respond(JRTServerConfigRequest request) {
Request req = request.getRequest();
if (req.isError()) {
- Level logLevel = (req.errorCode() == ErrorCode.APPLICATION_NOT_LOADED) ? Level.FINE : LogLevel.INFO;
+ Level logLevel = (req.errorCode() == ErrorCode.APPLICATION_NOT_LOADED) ? Level.FINE : Level.INFO;
log.log(logLevel, logPre + req.errorMessage());
}
rpcServer.respond(request);
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/LocalSessionStateWatcher.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/LocalSessionStateWatcher.java
index eb5770972ff..662094fc0ca 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/LocalSessionStateWatcher.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/LocalSessionStateWatcher.java
@@ -37,7 +37,7 @@ public class LocalSessionStateWatcher {
// Will delete session if it exists in local session repo
private void sessionChanged(Session.Status status) {
long sessionId = session.getSessionId();
- log.log(status == Session.Status.DELETE ? LogLevel.INFO : Level.FINE,
+ log.log(status == Session.Status.DELETE ? Level.INFO : Level.FINE,
session.logPre() + "Session change: Local session " + sessionId + " changed status to " + status);
if (status.equals(Session.Status.DELETE) && localSessionRepo.getSession(sessionId) != null) {
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java
index 287996f6bec..cdf57b68814 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java
@@ -176,7 +176,7 @@ public class SessionPreparerTest {
final StringBuilder logged = new StringBuilder();
DeployLogger logger = (level, message) -> {
System.out.println(level + ": "+message);
- if (level.equals(LogLevel.WARNING) && message.contains("The host mytesthost is already in use")) logged.append("ok");
+ if (level.equals(Level.WARNING) && message.contains("The host mytesthost is already in use")) logged.append("ok");
};
preparer.prepare(ctx, logger, new PrepareParams.Builder().build(), Optional.empty(), tenantPath, Instant.now());
assertEquals(logged.toString(), "");