From 8a4d1c484e09a697dc7a4ac4441268d197bde3a2 Mon Sep 17 00:00:00 2001 From: Arne H Juul Date: Fri, 17 Dec 2021 07:56:49 +0000 Subject: try to stop child when stopping --- logforwarder/src/apps/vespa-logforwarder-start/cf-handler.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'logforwarder/src/apps/vespa-logforwarder-start/cf-handler.cpp') diff --git a/logforwarder/src/apps/vespa-logforwarder-start/cf-handler.cpp b/logforwarder/src/apps/vespa-logforwarder-start/cf-handler.cpp index df4c6ee7f57..c76012d146a 100644 --- a/logforwarder/src/apps/vespa-logforwarder-start/cf-handler.cpp +++ b/logforwarder/src/apps/vespa-logforwarder-start/cf-handler.cpp @@ -84,7 +84,7 @@ CfHandler::doConfigure() getenv("VESPA_INSTANCE") != NULL && getenv("VESPA_ENVIRONMENT") != NULL && getenv("VESPA_REGION") != NULL) - { + { path = cfFilePath(config.splunkHome, "inputs.conf"); tmpPath = path + ".new"; fp = fopen(tmpPath.c_str(), "w"); @@ -99,9 +99,9 @@ CfHandler::doConfigure() if (config.clientName.size() == 0 || config.deploymentServer.size() == 0) { - childHandler.stopChild(config.splunkHome); + _childHandler.stopChild(); } else { - childHandler.startChild(config.splunkHome); + _childHandler.startChild(config.splunkHome); } } @@ -113,6 +113,10 @@ CfHandler::check() } } +void CfHandler::stop() { + _childHandler.stopChild(); +} + constexpr std::chrono::milliseconds CONFIG_TIMEOUT_MS(30 * 1000); void -- cgit v1.2.3