aboutsummaryrefslogtreecommitdiffstats
path: root/logserver
diff options
context:
space:
mode:
authorgjoranv <gv@verizonmedia.com>2020-04-24 13:03:16 +0200
committergjoranv <gv@verizonmedia.com>2020-04-25 02:16:53 +0200
commit4e6825b47270804a36e7d76b873ca6c2fe360eac (patch)
treec587e61a9e088cd61586ef3e1d7b59597de9975e /logserver
parentb406f648a6924104d4c5e9e29688ced5e3e2a9ae (diff)
Import java.util.logging.Level instead of com.yahoo.log.LogLevel
Diffstat (limited to 'logserver')
-rw-r--r--logserver/src/main/java/ai/vespa/logserver/protocol/ProtobufSerialization.java2
-rw-r--r--logserver/src/main/java/com/yahoo/logserver/AbstractPluginLoader.java2
-rw-r--r--logserver/src/main/java/com/yahoo/logserver/BuiltinPluginLoader.java2
-rw-r--r--logserver/src/main/java/com/yahoo/logserver/Flusher.java2
-rw-r--r--logserver/src/main/java/com/yahoo/logserver/LogDispatcher.java2
-rw-r--r--logserver/src/main/java/com/yahoo/logserver/filter/LogFilterManager.java2
-rw-r--r--logserver/src/main/java/com/yahoo/logserver/filter/MetricsFilter.java2
-rw-r--r--logserver/src/main/java/com/yahoo/logserver/handlers/HandlerThread.java2
-rw-r--r--logserver/src/main/java/com/yahoo/logserver/handlers/archive/ArchiverHandler.java2
-rw-r--r--logserver/src/main/java/com/yahoo/logserver/handlers/archive/LogWriter.java2
-rw-r--r--logserver/src/main/java/com/yahoo/logserver/handlers/logmetrics/LogMetricsHandler.java2
-rw-r--r--logserver/src/main/java/com/yahoo/logserver/testutils/VerifyLogfile.java2
-rw-r--r--logserver/src/test/java/ai/vespa/logserver/protocol/ArchiveLogMessagesMethodTest.java2
13 files changed, 13 insertions, 13 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 9065b47fa52..39bdeaa624e 100644
--- a/logserver/src/main/java/ai/vespa/logserver/protocol/ProtobufSerialization.java
+++ b/logserver/src/main/java/ai/vespa/logserver/protocol/ProtobufSerialization.java
@@ -3,7 +3,7 @@ package ai.vespa.logserver.protocol;
import ai.vespa.logserver.protocol.protobuf.LogProtocol;
import com.google.protobuf.InvalidProtocolBufferException;
-import com.yahoo.log.LogLevel;
+import java.util.logging.Level;
import com.yahoo.log.LogMessage;
import java.time.Instant;
diff --git a/logserver/src/main/java/com/yahoo/logserver/AbstractPluginLoader.java b/logserver/src/main/java/com/yahoo/logserver/AbstractPluginLoader.java
index f2393edeff3..b1d8de1bd98 100644
--- a/logserver/src/main/java/com/yahoo/logserver/AbstractPluginLoader.java
+++ b/logserver/src/main/java/com/yahoo/logserver/AbstractPluginLoader.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;
-import com.yahoo.log.LogLevel;
+import java.util.logging.Level;
import com.yahoo.plugin.Plugin;
import com.yahoo.plugin.SystemPropertyConfig;
diff --git a/logserver/src/main/java/com/yahoo/logserver/BuiltinPluginLoader.java b/logserver/src/main/java/com/yahoo/logserver/BuiltinPluginLoader.java
index 32427604bd6..c67dbe3bce8 100644
--- a/logserver/src/main/java/com/yahoo/logserver/BuiltinPluginLoader.java
+++ b/logserver/src/main/java/com/yahoo/logserver/BuiltinPluginLoader.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;
-import com.yahoo.log.LogLevel;
+import java.util.logging.Level;
import com.yahoo.logserver.handlers.archive.ArchiverPlugin;
import com.yahoo.logserver.handlers.logmetrics.LogMetricsPlugin;
diff --git a/logserver/src/main/java/com/yahoo/logserver/Flusher.java b/logserver/src/main/java/com/yahoo/logserver/Flusher.java
index d8d18bd2070..8958d350a89 100644
--- a/logserver/src/main/java/com/yahoo/logserver/Flusher.java
+++ b/logserver/src/main/java/com/yahoo/logserver/Flusher.java
@@ -7,7 +7,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.logging.Logger;
-import com.yahoo.log.LogLevel;
+import java.util.logging.Level;
import com.yahoo.logserver.handlers.LogHandler;
/**
diff --git a/logserver/src/main/java/com/yahoo/logserver/LogDispatcher.java b/logserver/src/main/java/com/yahoo/logserver/LogDispatcher.java
index afc901dc9e2..e74fa7a81f0 100644
--- a/logserver/src/main/java/com/yahoo/logserver/LogDispatcher.java
+++ b/logserver/src/main/java/com/yahoo/logserver/LogDispatcher.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;
-import com.yahoo.log.LogLevel;
+import java.util.logging.Level;
import com.yahoo.log.LogMessage;
import com.yahoo.logserver.handlers.LogHandler;
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 0e91bac164e..91f2ba3b96a 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 com.yahoo.log.LogLevel;
+import java.util.logging.Level;
/**
* 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 144d498e290..fbd192690a3 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 com.yahoo.log.LogLevel;
+import java.util.logging.Level;
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/HandlerThread.java b/logserver/src/main/java/com/yahoo/logserver/handlers/HandlerThread.java
index 776125fe24b..f1c08b9d390 100644
--- a/logserver/src/main/java/com/yahoo/logserver/handlers/HandlerThread.java
+++ b/logserver/src/main/java/com/yahoo/logserver/handlers/HandlerThread.java
@@ -7,7 +7,7 @@ import java.util.List;
import java.util.logging.Logger;
import com.yahoo.io.FatalErrorHandler;
-import com.yahoo.log.LogLevel;
+import java.util.logging.Level;
import com.yahoo.log.LogMessage;
import java.util.concurrent.BlockingQueue;
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 be788c23e80..e73ae531ecc 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
@@ -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.handlers.archive;
-import com.yahoo.log.LogLevel;
+import java.util.logging.Level;
import com.yahoo.log.LogMessage;
import com.yahoo.logserver.filter.LogFilter;
import com.yahoo.logserver.filter.LogFilterManager;
diff --git a/logserver/src/main/java/com/yahoo/logserver/handlers/archive/LogWriter.java b/logserver/src/main/java/com/yahoo/logserver/handlers/archive/LogWriter.java
index 83d6a4a0def..8635534ba7b 100644
--- a/logserver/src/main/java/com/yahoo/logserver/handlers/archive/LogWriter.java
+++ b/logserver/src/main/java/com/yahoo/logserver/handlers/archive/LogWriter.java
@@ -7,7 +7,7 @@ import java.io.IOException;
import java.io.Writer;
import java.util.logging.Logger;
-import com.yahoo.log.LogLevel;
+import java.util.logging.Level;
/**
* This class is not thread-safe.
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 fbf38fadc90..dc457d81ed5 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 com.yahoo.log.LogLevel;
+import java.util.logging.Level;
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 a398c2d6aff..d594df933f6 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 com.yahoo.log.LogLevel;
+import java.util.logging.Level;
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 93160c2a7a2..982cb8a9de7 100644
--- a/logserver/src/test/java/ai/vespa/logserver/protocol/ArchiveLogMessagesMethodTest.java
+++ b/logserver/src/test/java/ai/vespa/logserver/protocol/ArchiveLogMessagesMethodTest.java
@@ -10,7 +10,7 @@ import com.yahoo.jrt.Supervisor;
import com.yahoo.jrt.Target;
import com.yahoo.jrt.Transport;
import com.yahoo.jrt.Values;
-import com.yahoo.log.LogLevel;
+import java.util.logging.Level;
import com.yahoo.log.LogMessage;
import com.yahoo.logserver.LogDispatcher;
import org.junit.Test;