summaryrefslogtreecommitdiffstats
path: root/node-admin
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 /node-admin
parentd588f01d40105a13129b8e007a7f65231a6e1ca5 (diff)
Replace remaining LogLevel.<level> with corresponding Level
Diffstat (limited to 'node-admin')
-rw-r--r--node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/component/TaskContext.java4
-rw-r--r--node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java2
-rw-r--r--node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/AclMaintainer.java2
-rw-r--r--node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/identity/AthenzCredentialsMaintainer.java2
-rw-r--r--node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java10
5 files changed, 10 insertions, 10 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/component/TaskContext.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/component/TaskContext.java
index 74b47a49d2e..b84e25f59ed 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/component/TaskContext.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/component/TaskContext.java
@@ -28,7 +28,7 @@ public interface TaskContext {
}
/**
- * Log message at LogLevel.INFO, scoped to denote the current task. The message may
+ * Log message at Level.INFO, scoped to denote the current task. The message may
* also be directed to status pages or similar.
*
* Please do not call this too many times as that spams the log. Typically a task may call
@@ -37,7 +37,7 @@ public interface TaskContext {
* Do not log a message that is also recorded with recordSystemModification.
*/
default void log(Logger logger, String message) {
- log(logger, LogLevel.INFO, message);
+ log(logger, Level.INFO, message);
}
default void log(Logger logger, String messageFormat, Object... args) {
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java
index 16d0d823ac2..ef515022ae6 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java
@@ -82,7 +82,7 @@ public class StorageMaintainer {
diskUsage.put(context.containerName(), diskUsageBytes);
return Optional.of(diskUsageBytes);
} catch (Exception e) {
- context.log(logger, LogLevel.WARNING, "Failed to get disk usage", e);
+ context.log(logger, Level.WARNING, "Failed to get disk usage", e);
return Optional.empty();
}
}
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/AclMaintainer.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/AclMaintainer.java
index 0b5ddc6a943..360cea8a60d 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/AclMaintainer.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/acl/AclMaintainer.java
@@ -106,7 +106,7 @@ public class AclMaintainer {
context.log(logger, Level.SEVERE, "Rollback of table " + table + " failed, giving up", ne);
}
} else {
- context.log(logger, LogLevel.WARNING, "Unable to sync iptables for " + table, e);
+ context.log(logger, Level.WARNING, "Unable to sync iptables for " + table, e);
}
}
};
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/identity/AthenzCredentialsMaintainer.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/identity/AthenzCredentialsMaintainer.java
index 860cc8468e6..3320851a36c 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/identity/AthenzCredentialsMaintainer.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/identity/AthenzCredentialsMaintainer.java
@@ -136,7 +136,7 @@ public class AthenzCredentialsMaintainer implements CredentialsMaintainer {
if (shouldRefreshCredentials(age)) {
context.log(logger, "Certificate is ready to be refreshed (age=%s)", age.toString());
if (shouldThrottleRefreshAttempts(context.containerName(), now)) {
- context.log(logger, LogLevel.WARNING, String.format(
+ context.log(logger, Level.WARNING, String.format(
"Skipping refresh attempt as last refresh was on %s (less than %s ago)",
lastRefreshAttempt.get(context.containerName()).toString(), REFRESH_BACKOFF.toString()));
return false;
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java
index bc532a84b64..eb3bd0d6d2e 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java
@@ -290,7 +290,7 @@ public class NodeAgentImpl implements NodeAgent {
} catch (RuntimeException e) {
// It's bad to continue as-if nothing happened, but on the other hand if we do not proceed to
// remove container, we will not be able to upgrade to fix any problems in the suspend logic!
- context.log(logger, LogLevel.WARNING, "Failed trying to suspend container", e);
+ context.log(logger, Level.WARNING, "Failed trying to suspend container", e);
}
}
@@ -340,7 +340,7 @@ public class NodeAgentImpl implements NodeAgent {
}
stopServices(context);
} catch (Exception e) {
- context.log(logger, LogLevel.WARNING, "Failed stopping services, ignoring", e);
+ context.log(logger, Level.WARNING, "Failed stopping services, ignoring", e);
}
}
@@ -396,12 +396,12 @@ public class NodeAgentImpl implements NodeAgent {
public void converge(NodeAgentContext context) {
try {
doConverge(context);
- context.log(logger, LogLevel.INFO, "Converged");
+ context.log(logger, Level.INFO, "Converged");
} catch (ConvergenceException e) {
context.log(logger, e.getMessage());
} catch (ContainerNotFoundException e) {
containerState = ABSENT;
- context.log(logger, LogLevel.WARNING, "Container unexpectedly gone, resetting containerState to " + containerState);
+ context.log(logger, Level.WARNING, "Container unexpectedly gone, resetting containerState to " + containerState);
} catch (DockerException e) {
numberOfUnhandledException++;
context.log(logger, Level.SEVERE, "Caught a DockerException", e);
@@ -510,7 +510,7 @@ public class NodeAgentImpl implements NodeAgent {
StringBuilder builder = new StringBuilder();
appendIfDifferent(builder, "state", lastNode, node, NodeSpec::state);
if (builder.length() > 0) {
- context.log(logger, LogLevel.INFO, "Changes to node: " + builder.toString());
+ context.log(logger, Level.INFO, "Changes to node: " + builder.toString());
}
}