be more careful about splunk start/stop

* validate the configurable splunk-home
* do stopping via C++ program instead of shell command
* some refactoring of C++ code as well

2 files changed, 3 insertions, 2 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/LogForwarder.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/LogForwarder.java
index cc1369c2470..abb86f4d1ca 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/LogForwarder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/LogForwarder.java
@@ -86,7 +86,8 @@ public class LogForwarder extends AbstractService implements LogforwarderConfig.
         getConfig(builder);
         var cfg = new LogforwarderConfig(builder);
         var home = cfg.splunkHome();
-        return Optional.of("/usr/bin/env SPLUNK_HOME="+home+" "+home+"/bin/splunk stop");
+        String cmd = "$ROOT/bin/vespa-logforwarder-start -S -c " + getConfigId();
+        return Optional.of(cmd);
     }
 
 }
diff --git a/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java b/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java
index 30b848da7f1..5f57c399cfd 100644
--- a/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java
+++ b/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java
@@ -972,7 +972,7 @@ public class ModelProvisioningTest {
 
         var lfs = hostResource.getService("logforwarder");
         String shutdown = lfs.getPreShutdownCommand().orElse("<none>");
-        assertEquals("/usr/bin/env SPLUNK_HOME=/opt/splunkforwarder /opt/splunkforwarder/bin/splunk stop", shutdown);
+        assertTrue(shutdown.startsWith("$ROOT/bin/vespa-logforwarder-start -S -c hosts/"));
     }