make it possible to stop forwarder also

3 files changed, 15 insertions, 1 deletions

diff --git a/logforwarder/src/apps/vespa-logforwarder-start/cf-handler.cpp b/logforwarder/src/apps/vespa-logforwarder-start/cf-handler.cpp
index bdd1855f95c..5517017eefa 100644
--- a/logforwarder/src/apps/vespa-logforwarder-start/cf-handler.cpp
+++ b/logforwarder/src/apps/vespa-logforwarder-start/cf-handler.cpp
@@ -76,7 +76,13 @@ CfHandler::doConfigure()
     fclose(fp);
     rename(tmpPath.c_str(), path.c_str());
 
-    childHandler.startChild(config.splunkHome);
+    if (config.clientName.size() == 0 ||
+        config.deploymentServer.size() == 0)
+    {
+        childHandler.stopChild(config.splunkHome);
+    } else {
+        childHandler.startChild(config.splunkHome);
+    }
 }
 
 void
diff --git a/logforwarder/src/apps/vespa-logforwarder-start/child-handler.cpp b/logforwarder/src/apps/vespa-logforwarder-start/child-handler.cpp
index 6abf807ec8b..6ed209cbe5b 100644
--- a/logforwarder/src/apps/vespa-logforwarder-start/child-handler.cpp
+++ b/logforwarder/src/apps/vespa-logforwarder-start/child-handler.cpp
@@ -78,3 +78,10 @@ ChildHandler::startChild(const vespalib::string &prefix)
     }
     runSplunk(prefix, "restart");
 }
+
+void
+ChildHandler::stopChild(const vespalib::string &prefix)
+{
+    runSplunk(prefix, "stop");
+    _childRunning = false;
+}
diff --git a/logforwarder/src/apps/vespa-logforwarder-start/child-handler.h b/logforwarder/src/apps/vespa-logforwarder-start/child-handler.h
index 619dc1e40aa..0c07b208871 100644
--- a/logforwarder/src/apps/vespa-logforwarder-start/child-handler.h
+++ b/logforwarder/src/apps/vespa-logforwarder-start/child-handler.h
@@ -8,5 +8,6 @@ private:
     bool _childRunning;
 public:
     void startChild(const vespalib::string &prefix);
+    void stopChild(const vespalib::string &prefix);
     ChildHandler();
 };