summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgjoranv <gv@verizonmedia.com>2020-04-25 00:09:00 +0200
committergjoranv <gv@verizonmedia.com>2020-04-25 02:24:39 +0200
commitc0c9169385861c23ba640212ebb1b3beecd555d5 (patch)
tree21c4bf4dc60513c2f03792c28f49629b8baf9825
parent89fa2fd9926579e6e2b24adf4281d063ecf62c43 (diff)
Use correct log Level class where search & replace has failed.
-rw-r--r--clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StateChangeHandler.java2
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java2
-rw-r--r--container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java2
-rw-r--r--container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcher.java2
-rw-r--r--metrics-proxy/src/main/java/ai/vespa/metricsproxy/rpc/RpcServer.java4
-rw-r--r--vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/ClientFeederV3.java2
6 files changed, 7 insertions, 7 deletions
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StateChangeHandler.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StateChangeHandler.java
index 18e548f6f1c..cb6bacf97a6 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StateChangeHandler.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StateChangeHandler.java
@@ -118,7 +118,7 @@ public class StateChangeHandler {
final NodeStateOrHostInfoChangeHandler nodeListener)
{
final NodeState currentState = currentClusterState.getNodeState(node.getNode());
- final LogLevel level = (currentState.equals(reportedState) && node.getVersion() == 0) ? Level.FINEST : Level.FINE;
+ final Level level = (currentState.equals(reportedState) && node.getVersion() == 0) ? Level.FINEST : Level.FINE;
if (log.isLoggable(level)) {
log.log(level, String.format("Got nodestate reply from %s: %s (Current state is %s)",
node, node.getReportedState().getTextualDifference(reportedState), currentState.toString(true)));
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java
index 8082b340970..3cad8def541 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java
@@ -296,7 +296,7 @@ public class RpcServer implements Runnable, ReloadListener, TenantListener {
log.log(Level.FINE, logPre + "Finished reloading " + responsesSent + " requests");
}
- private void logRequestDebug(LogLevel level, String message, JRTServerConfigRequest request) {
+ private void logRequestDebug(Level level, String message, JRTServerConfigRequest request) {
if (log.isLoggable(level)) {
log.log(level, message + request.getShortDescription());
}
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 2a4fc66dc27..3a99ee7d0c6 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
@@ -118,7 +118,7 @@ public abstract class ThreadedHttpRequestHandler extends ThreadedRequestHandler
catch (IOException e) {
metric.add(RENDERING_ERRORS, 1, null);
long time = System.currentTimeMillis() - startTime;
- log.log(time < 900 ? Level.INFO : LogLevel.WARNING,
+ log.log(time < 900 ? Level.INFO : Level.WARNING,
"IO error while responding to " + " ["
+ request.getUri() + "] " + "(total time "
+ time + " ms) ", e);
diff --git a/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcher.java b/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcher.java
index 56b5a826cba..8bd7bdac8a5 100644
--- a/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcher.java
+++ b/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcher.java
@@ -300,7 +300,7 @@ public class VdsStreamingSearcher extends VespaBackEndSearcher {
String expUserId = query.properties().getString(streamingUserid);
String expGroupName = query.properties().getString(streamingGroupname);
- LogLevel logLevel = Level.SEVERE;
+ Level logLevel = Level.SEVERE;
if (skippedEarlierResult) {
logLevel = Level.FINE;
}
diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/rpc/RpcServer.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/rpc/RpcServer.java
index e634d533e5c..30e7d7b81f8 100644
--- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/rpc/RpcServer.java
+++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/rpc/RpcServer.java
@@ -197,9 +197,9 @@ public class RpcServer {
}
private void logSpentTime() {
- Level logLevel = DEBUG;
+ Level logLevel = Level.FINE;
if (spentTime() > LOG_SPENT_TIME_LIMIT) {
- logLevel = INFO;
+ logLevel = Level.INFO;
}
if (log.isLoggable(logLevel)) {
log.log(logLevel, "RPC request '" + request.methodName() + "' with parameters '" +
diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/ClientFeederV3.java b/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/ClientFeederV3.java
index 2c06c4a296a..db1c2471752 100644
--- a/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/ClientFeederV3.java
+++ b/vespaclient-container-plugin/src/main/java/com/yahoo/vespa/http/server/ClientFeederV3.java
@@ -325,7 +325,7 @@ class ClientFeederV3 {
}
}
- protected final void log(LogLevel level, Object... msgParts) {
+ protected final void log(Level level, Object... msgParts) {
StringBuilder s;
if (!log.isLoggable(level)) {