move logforwarder.def to configdefinitions module

7 files changed, 8 insertions, 129 deletions

diff --git a/logforwarder/pom.xml b/logforwarder/pom.xml
deleted file mode 100644
index 505ca9f108b..00000000000
--- a/logforwarder/pom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
-                             http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.yahoo.vespa</groupId>
-    <artifactId>parent</artifactId>
-    <version>6-SNAPSHOT</version>
-  </parent>
-  <artifactId>logforwarder</artifactId>
-  <version>6-SNAPSHOT</version>
-  <packaging>jar</packaging>
-  <name>${project.artifactId}</name>
-  <dependencies>
-    <dependency>
-      <groupId>com.yahoo.vespa</groupId>
-      <artifactId>config-lib</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>com.yahoo.vespa</groupId>
-        <artifactId>config-class-plugin</artifactId>
-        <version>${project.version}</version>
-        <executions>
-          <execution>
-            <id>config-gen</id>
-            <goals>
-              <goal>config-gen</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>
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=""
diff --git a/logforwarder/src/main/resources/configdefinitions/logforwarder.def b/logforwarder/src/main/resources/configdefinitions/logforwarder.def
deleted file mode 100644
index 205e8ad3b8c..00000000000
--- a/logforwarder/src/main/resources/configdefinitions/logforwarder.def
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace=cloud.config
-
-# only splunk type config for now
-
-deploymentServer string default=""
-clientName string default=""
diff --git a/logforwarder/src/main/sh/vespa-logforwarder-start.sh b/logforwarder/src/main/sh/vespa-logforwarder-start.sh
deleted file mode 100755
index 20864d7b4e6..00000000000
--- a/logforwarder/src/main/sh/vespa-logforwarder-start.sh
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/bin/sh
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-
-# BEGIN environment bootstrap section
-# Do not edit between here and END as this section should stay identical in all scripts
-
-findpath () {
-    myname=${0}
-    mypath=${myname%/*}
-    myname=${myname##*/}
-    if [ "$mypath" ] && [ -d "$mypath" ]; then
-        return
-    fi
-    mypath=$(pwd)
-    if [ -f "${mypath}/${myname}" ]; then
-        return
-    fi
-    echo "FATAL: Could not figure out the path where $myname lives from $0"
-    exit 1
-}
-
-COMMON_ENV=libexec/vespa/common-env.sh
-
-source_common_env () {
-    if [ "$VESPA_HOME" ] && [ -d "$VESPA_HOME" ]; then
-        export VESPA_HOME
-        common_env=$VESPA_HOME/$COMMON_ENV
-        if [ -f "$common_env" ]; then
-            . $common_env
-            return
-        fi
-    fi
-    return 1
-}
-
-findroot () {
-    source_common_env && return
-    if [ "$VESPA_HOME" ]; then
-        echo "FATAL: bad VESPA_HOME value '$VESPA_HOME'"
-        exit 1
-    fi
-    if [ "$ROOT" ] && [ -d "$ROOT" ]; then
-        VESPA_HOME="$ROOT"
-        source_common_env && return
-    fi
-    findpath
-    while [ "$mypath" ]; do
-        VESPA_HOME=${mypath}
-        source_common_env && return
-        mypath=${mypath%/*}
-    done
-    echo "FATAL: missing VESPA_HOME environment variable"
-    echo "Could not locate $COMMON_ENV anywhere"
-    exit 1
-}
-
-findroot
-
-# END environment bootstrap section
-
-ROOT=${VESPA_HOME%/}
-export ROOT
-cd $ROOT || { echo "Cannot cd to $ROOT" 1>&2; exit 1; }
-
-# TODO: Get config and start logforwarder properly
-
-configid=$1
-
-config=`$VESPA_HOME/bin/vespa-get-config -j -n cloud.config.logforwarder -i $configid`
-echo $config
-
-sleep 10000000