diff options
| author | Arne H Juul <arnej@yahoo-inc.com> | 2016-08-26 15:18:27 +0200 |
|---|---|---|
| committer | Arne H Juul <arnej@yahoo-inc.com> | 2016-08-31 10:37:15 +0200 |
| commit | a20eb6eab5fe27128055f0f88166eec05e0413ac (patch) | |
| tree | c958c9e3df840b07480ddfad7bf5138f68eb1035 /fileacquirer | |
| parent | bca73f4f4e56d0a016b99b3917a075823c193c57 (diff) | |
subscribe to ranking constants config
* move the .def file for filedistributorrpc to fileacquirerer, and
compile a minimal C++ library from it that can be used by both searchcore
and file distribution
* proton now subscribes to filedistributorrpc as a bootstrap config
* and subscribes to ranking-constants as part of the documentdb config
* when loading a config snapshot, make an empty ranking-constants.cfg
if it did not already exist
Diffstat (limited to 'fileacquirer')
| -rw-r--r-- | fileacquirer/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | fileacquirer/pom.xml | 17 | ||||
| -rw-r--r-- | fileacquirer/src/main/resources/configdefinitions/filedistributorrpc.def | 3 | ||||
| -rw-r--r-- | fileacquirer/src/vespa/fileacquirer/.gitignore | 2 | ||||
| -rw-r--r-- | fileacquirer/src/vespa/fileacquirer/CMakeLists.txt | 7 | ||||
| l--------- | fileacquirer/src/vespa/fileacquirer/filedistributorrpc.def | 1 |
6 files changed, 41 insertions, 0 deletions
diff --git a/fileacquirer/CMakeLists.txt b/fileacquirer/CMakeLists.txt new file mode 100644 index 00000000000..54fa8036c66 --- /dev/null +++ b/fileacquirer/CMakeLists.txt @@ -0,0 +1,11 @@ +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +vespa_define_module( + DEPENDS + fastos + vespalog + vespalib + config_cloudconfig + + LIBS + src/vespa/fileacquirer +) diff --git a/fileacquirer/pom.xml b/fileacquirer/pom.xml index f6269b29b01..4455950f95a 100644 --- a/fileacquirer/pom.xml +++ b/fileacquirer/pom.xml @@ -27,4 +27,21 @@ <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/fileacquirer/src/main/resources/configdefinitions/filedistributorrpc.def b/fileacquirer/src/main/resources/configdefinitions/filedistributorrpc.def new file mode 100644 index 00000000000..ceadd8ae8c8 --- /dev/null +++ b/fileacquirer/src/main/resources/configdefinitions/filedistributorrpc.def @@ -0,0 +1,3 @@ +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +namespace=cloud.config.filedistribution +connectionspec string diff --git a/fileacquirer/src/vespa/fileacquirer/.gitignore b/fileacquirer/src/vespa/fileacquirer/.gitignore new file mode 100644 index 00000000000..ca425c74c7c --- /dev/null +++ b/fileacquirer/src/vespa/fileacquirer/.gitignore @@ -0,0 +1,2 @@ +config-filedistributorrpc.cpp +config-filedistributorrpc.h diff --git a/fileacquirer/src/vespa/fileacquirer/CMakeLists.txt b/fileacquirer/src/vespa/fileacquirer/CMakeLists.txt new file mode 100644 index 00000000000..6afe392dddd --- /dev/null +++ b/fileacquirer/src/vespa/fileacquirer/CMakeLists.txt @@ -0,0 +1,7 @@ +# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +vespa_add_library(fileacquirer STATIC + SOURCES + DEPENDS +) +vespa_generate_config(fileacquirer filedistributorrpc.def) +install(FILES filedistributorrpc.def DESTINATION var/db/vespa/config_server/serverdb/classes) diff --git a/fileacquirer/src/vespa/fileacquirer/filedistributorrpc.def b/fileacquirer/src/vespa/fileacquirer/filedistributorrpc.def new file mode 120000 index 00000000000..c12c0b8299e --- /dev/null +++ b/fileacquirer/src/vespa/fileacquirer/filedistributorrpc.def @@ -0,0 +1 @@ +../../main/resources/configdefinitions/filedistributorrpc.def
\ No newline at end of file |