diff options
author | gjoranv <gv@verizonmedia.com> | 2020-04-24 16:28:41 +0200 |
---|---|---|
committer | gjoranv <gv@verizonmedia.com> | 2020-04-25 02:24:38 +0200 |
commit | 91902bc7a20d8e6af77219e38fb645649610cd5e (patch) | |
tree | 59ec9603d0fc75110a744e48f41ee872db0f01d5 /logserver | |
parent | c8837ab237c9631ab605eb9619c8ceea3036ad7e (diff) |
Use LogLevel where appropriate in 'logserver'
Diffstat (limited to 'logserver')
7 files changed, 7 insertions, 8 deletions
diff --git a/logserver/src/main/java/ai/vespa/logserver/protocol/ProtobufSerialization.java b/logserver/src/main/java/ai/vespa/logserver/protocol/ProtobufSerialization.java index 39bdeaa624e..6e2a074cf8f 100644 --- a/logserver/src/main/java/ai/vespa/logserver/protocol/ProtobufSerialization.java +++ b/logserver/src/main/java/ai/vespa/logserver/protocol/ProtobufSerialization.java @@ -8,7 +8,7 @@ import com.yahoo.log.LogMessage; import java.time.Instant; import java.util.List; -import java.util.logging.Level; +import com.yahoo.log.LogLevel; import static java.util.stream.Collectors.toList; diff --git a/logserver/src/main/java/com/yahoo/logserver/filter/LogFilterManager.java b/logserver/src/main/java/com/yahoo/logserver/filter/LogFilterManager.java index 91f2ba3b96a..0e91bac164e 100644 --- a/logserver/src/main/java/com/yahoo/logserver/filter/LogFilterManager.java +++ b/logserver/src/main/java/com/yahoo/logserver/filter/LogFilterManager.java @@ -4,7 +4,7 @@ package com.yahoo.logserver.filter; import java.util.HashMap; import java.util.Map; -import java.util.logging.Level; +import com.yahoo.log.LogLevel; /** * The LogFilterManager keeps track of associations between diff --git a/logserver/src/main/java/com/yahoo/logserver/filter/MetricsFilter.java b/logserver/src/main/java/com/yahoo/logserver/filter/MetricsFilter.java index fbd192690a3..144d498e290 100644 --- a/logserver/src/main/java/com/yahoo/logserver/filter/MetricsFilter.java +++ b/logserver/src/main/java/com/yahoo/logserver/filter/MetricsFilter.java @@ -1,7 +1,7 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.logserver.filter; -import java.util.logging.Level; +import com.yahoo.log.LogLevel; import com.yahoo.log.event.Count; import com.yahoo.log.event.CountGroup; import com.yahoo.log.event.Event; 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 8ed6ec6de00..ee8c6e36cb8 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 @@ -14,7 +14,6 @@ import java.util.Calendar; import java.util.GregorianCalendar; import java.util.Iterator; import java.util.TimeZone; -import java.util.logging.Level; import java.util.logging.Logger; diff --git a/logserver/src/main/java/com/yahoo/logserver/handlers/logmetrics/LogMetricsHandler.java b/logserver/src/main/java/com/yahoo/logserver/handlers/logmetrics/LogMetricsHandler.java index da19edb8413..9566c534d5d 100644 --- a/logserver/src/main/java/com/yahoo/logserver/handlers/logmetrics/LogMetricsHandler.java +++ b/logserver/src/main/java/com/yahoo/logserver/handlers/logmetrics/LogMetricsHandler.java @@ -12,7 +12,7 @@ import java.util.ArrayList; import java.util.logging.Logger; import java.util.logging.Level; -import java.util.logging.Level; +import com.yahoo.log.LogLevel; import com.yahoo.log.event.Event; import com.yahoo.logserver.filter.LevelFilter; import com.yahoo.log.LogMessage; diff --git a/logserver/src/main/java/com/yahoo/logserver/testutils/VerifyLogfile.java b/logserver/src/main/java/com/yahoo/logserver/testutils/VerifyLogfile.java index d594df933f6..a398c2d6aff 100644 --- a/logserver/src/main/java/com/yahoo/logserver/testutils/VerifyLogfile.java +++ b/logserver/src/main/java/com/yahoo/logserver/testutils/VerifyLogfile.java @@ -5,7 +5,7 @@ import java.io.BufferedReader; import java.io.FileReader; import java.io.IOException; -import java.util.logging.Level; +import com.yahoo.log.LogLevel; import com.yahoo.log.event.MalformedEventException; import com.yahoo.log.InvalidLogFormatException; import com.yahoo.log.LogMessage; diff --git a/logserver/src/test/java/ai/vespa/logserver/protocol/ArchiveLogMessagesMethodTest.java b/logserver/src/test/java/ai/vespa/logserver/protocol/ArchiveLogMessagesMethodTest.java index 982cb8a9de7..1dd79316eda 100644 --- a/logserver/src/test/java/ai/vespa/logserver/protocol/ArchiveLogMessagesMethodTest.java +++ b/logserver/src/test/java/ai/vespa/logserver/protocol/ArchiveLogMessagesMethodTest.java @@ -31,9 +31,9 @@ import static org.mockito.Mockito.verify; public class ArchiveLogMessagesMethodTest { private static final LogMessage MESSAGE_1 = - LogMessage.of(Instant.EPOCH.plus(1000, ChronoUnit.DAYS), "localhost", 12, 3456, "my-service", "my-component", LogLevel.ERROR, "My error message"); + LogMessage.of(Instant.EPOCH.plus(1000, ChronoUnit.DAYS), "localhost", 12, 3456, "my-service", "my-component", Level.SEVERE, "My error message"); private static final LogMessage MESSAGE_2 = - LogMessage.of(Instant.EPOCH.plus(5005, ChronoUnit.DAYS), "localhost", 12, 6543, "my-service", "my-component", LogLevel.INFO, "My info message"); + LogMessage.of(Instant.EPOCH.plus(5005, ChronoUnit.DAYS), "localhost", 12, 6543, "my-service", "my-component", Level.INFO, "My info message"); @Test public void server_dispatches_log_messages_from_log_request() { |