summaryrefslogtreecommitdiffstats
path: root/node-maintainer
diff options
context:
space:
mode:
authorvalerijf <valerijf@yahoo-inc.com>2017-03-13 15:34:48 +0100
committervalerijf <valerijf@yahoo-inc.com>2017-03-13 15:34:48 +0100
commite66003efc8d68cbe2dbc33064bd3049c30361a06 (patch)
tree40c45a20d53495a4ddfa29ae7d600c4e590429ce /node-maintainer
parentdbd533f835515a9277fc94c9d36a0d51b6cff751 (diff)
Do not fail on optional arguments
Diffstat (limited to 'node-maintainer')
-rw-r--r--node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/maintainer/Maintainer.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/maintainer/Maintainer.java b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/maintainer/Maintainer.java
index 919643f40ee..f2b6b99db61 100644
--- a/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/maintainer/Maintainer.java
+++ b/node-maintainer/src/main/java/com/yahoo/vespa/hosted/node/maintainer/Maintainer.java
@@ -74,7 +74,7 @@ public class Maintainer {
private static void parseDeleteFilesJob(Inspector arguments) {
Path basePath = Paths.get(getFieldOrFail(arguments, "basePath").asString());
Duration maxAge = Duration.ofSeconds(getFieldOrFail(arguments, "maxAgeSeconds").asLong());
- Optional<String> fileNameRegex = SlimeUtils.optionalString(getFieldOrFail(arguments, "fileNameRegex"));
+ Optional<String> fileNameRegex = SlimeUtils.optionalString(arguments.field("fileNameRegex"));
boolean recursive = getFieldOrFail(arguments, "recursive").asBool();
try {
FileHelper.deleteFiles(basePath, maxAge, fileNameRegex, recursive);
@@ -89,7 +89,7 @@ public class Maintainer {
private static void parseDeleteDirectoriesJob(Inspector arguments) {
Path basePath = Paths.get(getFieldOrFail(arguments, "basePath").asString());
Duration maxAge = Duration.ofSeconds(getFieldOrFail(arguments, "maxAgeSeconds").asLong());
- Optional<String> dirNameRegex = SlimeUtils.optionalString(getFieldOrFail(arguments, "dirNameRegex"));
+ Optional<String> dirNameRegex = SlimeUtils.optionalString(arguments.field("dirNameRegex"));
try {
FileHelper.deleteDirectories(basePath, maxAge, dirNameRegex);
} catch (IOException e) {