Merge pull request #2170 from yahoo/hmusum/setup-logging-for-node-maintainer

Setup logging for node-maintainer

2 files changed, 9 insertions, 3 deletions

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 6b4c40f352b..9313d238f9e 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
@@ -33,6 +33,8 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
 import java.util.regex.Pattern;
 
+import static com.yahoo.vespa.defaults.Defaults.getDefaults;
+
 /**
  * @author freva
  */
@@ -267,10 +269,12 @@ public class StorageMaintainer {
             try {
                 args = objectMapper.writeValueAsString(jobs);
             } catch (JsonProcessingException e) {
-                throw new RuntimeException("Failed trasform list of maintenance jobs to JSON");
+                throw new RuntimeException("Failed transform list of maintenance jobs to JSON");
             }
 
-            String[] command = {"java", "-cp", classPath, "com.yahoo.vespa.hosted.node.maintainer.Maintainer", args};
+            String[] command = {"java", "-cp", classPath,
+                    "-Dvespa.log.target=file:" + getDefaults().underVespaHome("logs/vespa/vespa.log"),
+                    "com.yahoo.vespa.hosted.node.maintainer.Maintainer", args};
             ProcessResult result = docker.executeInContainerAsRoot(executeIn, command);
 
             if (! result.isSuccess()) {
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 8a1751fe9a7..932681c4c26 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
@@ -1,6 +1,7 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hosted.node.maintainer;
 
+import com.yahoo.log.LogSetup;
 import com.yahoo.slime.ArrayTraverser;
 import com.yahoo.slime.Inspector;
 import com.yahoo.slime.Type;
@@ -26,13 +27,14 @@ public class Maintainer {
     private static final HttpClient httpClient = HttpClientBuilder.create().build();
 
     public static void main(String[] args) {
+        LogSetup.initVespaLogging("node-maintainer");
         if (args.length != 1) {
             throw new RuntimeException("Expected only 1 argument - a JSON list of maintainer jobs to execute");
         }
 
         Inspector object = SlimeUtils.jsonToSlime(args[0].getBytes()).get();
         if (object.type() != Type.ARRAY) {
-            throw new IllegalArgumentException("Expected a list maintainer jobs to execute");
+            throw new IllegalArgumentException("Expected a list of maintainer jobs to execute");
         }
 
         // Variable must be effectively final to be used in lambda expression