summaryrefslogtreecommitdiffstats
path: root/node-admin
diff options
context:
space:
mode:
authorValerij Fredriksen <valerijf@oath.com>2018-08-01 11:58:28 +0200
committerValerij Fredriksen <valerijf@oath.com>2018-08-01 11:58:28 +0200
commit1126cca9bea7d04e3a6408de5e18c7bff675a034 (patch)
tree46e4a5e22445e3bb171a9565a656dde9bfcc6831 /node-admin
parentccf197e50ef375abf16a879f2c66ea020609bcf4 (diff)
Log StoredInteger updates
Diffstat (limited to 'node-admin')
-rw-r--r--node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/component/TaskContext.java8
-rw-r--r--node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/file/StoredInteger.java8
2 files changed, 11 insertions, 5 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 0c49e478d6a..3c44186f78d 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
@@ -21,8 +21,8 @@ public interface TaskContext {
* to bob".
*/
void recordSystemModification(Logger logger, String message);
- default void recordSystemModification(Logger logger, String messageFormat, String... args) {
- recordSystemModification(logger, String.format(messageFormat, (Object[]) args));
+ default void recordSystemModification(Logger logger, String messageFormat, Object... args) {
+ recordSystemModification(logger, String.format(messageFormat, args));
}
/**
@@ -35,8 +35,8 @@ public interface TaskContext {
* Do not log a message that is also recorded with recordSystemModification.
*/
default void log(Logger logger, String message) {}
- default void log(Logger logger, String messageFormat, String... args) {
- log(logger, String.format(messageFormat, (Object[]) args));
+ default void log(Logger logger, String messageFormat, Object... args) {
+ log(logger, String.format(messageFormat, args));
}
/**
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/file/StoredInteger.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/file/StoredInteger.java
index 61c0624e6a9..2c15912ae58 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/file/StoredInteger.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/file/StoredInteger.java
@@ -1,6 +1,8 @@
// Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package com.yahoo.vespa.hosted.node.admin.task.util.file;
+import com.yahoo.vespa.hosted.node.admin.component.TaskContext;
+
import java.io.IOException;
import java.io.UncheckedIOException;
import java.nio.file.Files;
@@ -8,6 +10,7 @@ import java.nio.file.NoSuchFileException;
import java.nio.file.Path;
import java.util.OptionalInt;
import java.util.function.Supplier;
+import java.util.logging.Logger;
/**
* Class wrapping an integer stored on disk
@@ -16,6 +19,8 @@ import java.util.function.Supplier;
*/
public class StoredInteger implements Supplier<OptionalInt> {
+ private static Logger logger = Logger.getLogger(StoredInteger.class.getName());
+
private final Path path;
private OptionalInt value;
private boolean hasBeenRead = false;
@@ -40,11 +45,12 @@ public class StoredInteger implements Supplier<OptionalInt> {
return value;
}
- public void write(int value) {
+ public void write(TaskContext taskContext, int value) {
try {
Files.write(path, Integer.toString(value).getBytes());
this.value = OptionalInt.of(value);
this.hasBeenRead = true;
+ taskContext.log(logger, "Stored new integer in %s: %d", path, value);
} catch (IOException e) {
throw new UncheckedIOException("Failed to store integer in " + path, e);
}