diff options
Diffstat (limited to 'logforwarder/src/apps')
4 files changed, 8 insertions, 11 deletions
diff --git a/logforwarder/src/apps/vespa-logforwarder-start/CMakeLists.txt b/logforwarder/src/apps/vespa-logforwarder-start/CMakeLists.txt index ac9667d5f9e..be124fd641c 100644 --- a/logforwarder/src/apps/vespa-logforwarder-start/CMakeLists.txt +++ b/logforwarder/src/apps/vespa-logforwarder-start/CMakeLists.txt @@ -8,6 +8,5 @@ vespa_add_executable(vespa-logforwarder-start_app INSTALL bin DEPENDS config_cloudconfig + configdefinitions ) -vespa_generate_config(vespa-logforwarder-start_app logforwarder.def) -install(FILES logforwarder.def RENAME cloud.config.logforwarder.def DESTINATION var/db/vespa/config_server/serverdb/classes) diff --git a/logforwarder/src/apps/vespa-logforwarder-start/cf-handler.cpp b/logforwarder/src/apps/vespa-logforwarder-start/cf-handler.cpp index 13370c08b59..b4b4bdbc7f2 100644 --- a/logforwarder/src/apps/vespa-logforwarder-start/cf-handler.cpp +++ b/logforwarder/src/apps/vespa-logforwarder-start/cf-handler.cpp @@ -1,6 +1,10 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "cf-handler.h" +#include <dirent.h> +#include <stdio.h> +#include <sys/stat.h> +#include <sys/types.h> #include <vespa/defaults.h> #include <vespa/config/common/configsystem.h> #include <vespa/config/common/exceptions.h> @@ -26,12 +30,12 @@ cfFilePath() { std::string path = vespa::Defaults::underVespaHome("var/db/vespa/splunk"); DIR *dp = opendir(path.c_str()); if (dp == NULL) { - if (errno != ENOTDIR || mkdir(path.c_str() != 0)) { + if (errno != ENOTDIR || mkdir(path.c_str(), 0755) != 0) { perror(path.c_str()); } } if (dp != NULL) closedir(dp); - path += "/deploymentclient.conf; + path += "/deploymentclient.conf"; return path; } } diff --git a/logforwarder/src/apps/vespa-logforwarder-start/cf-handler.h b/logforwarder/src/apps/vespa-logforwarder-start/cf-handler.h index 6ad27d81b0d..99f0a6cd6d5 100644 --- a/logforwarder/src/apps/vespa-logforwarder-start/cf-handler.h +++ b/logforwarder/src/apps/vespa-logforwarder-start/cf-handler.h @@ -2,7 +2,7 @@ #pragma once #include <vespa/config/config.h> -#include "config-logforwarder.h" +#include <vespa/config-logforwarder.h> using cloud::config::LogforwarderConfig; diff --git a/logforwarder/src/apps/vespa-logforwarder-start/logforwarder.def b/logforwarder/src/apps/vespa-logforwarder-start/logforwarder.def deleted file mode 100644 index 205e8ad3b8c..00000000000 --- a/logforwarder/src/apps/vespa-logforwarder-start/logforwarder.def +++ /dev/null @@ -1,6 +0,0 @@ -namespace=cloud.config - -# only splunk type config for now - -deploymentServer string default="" -clientName string default="" |