diff options
| author | Harald Musum <musum@oath.com> | 2018-09-04 09:53:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-04 09:53:02 +0200 |
| commit | a5a3916318a24d32112266b60510e60fffdb93e9 (patch) | |
| tree | b4b37a7375066ec86b39c1e1fb5720397a8d3a72 | |
| parent | 34f9683077f958fce2963458ce42143c66bcb88b (diff) | |
Revert "Revert "Explicitly use legacy format option to vespa-get-config""
| -rwxr-xr-x | container-disc/src/main/sh/vespa-start-container-daemon.sh | 2 | ||||
| -rw-r--r-- | vespaclient/src/perl/lib/Yahoo/Vespa/VespaModel.pm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/container-disc/src/main/sh/vespa-start-container-daemon.sh b/container-disc/src/main/sh/vespa-start-container-daemon.sh index e6219ab0467..21c9dc28022 100755 --- a/container-disc/src/main/sh/vespa-start-container-daemon.sh +++ b/container-disc/src/main/sh/vespa-start-container-daemon.sh @@ -52,7 +52,7 @@ getconfig() { qrstartcfg="`cat ${config_dir}/qr-start.cfg`" ;; *) - qrstartcfg="`$VESPA_HOME/bin/vespa-get-config -w 10 -n search.config.qr-start -i ${VESPA_CONFIG_ID}`" + qrstartcfg="`$VESPA_HOME/bin/vespa-get-config -l -w 10 -n search.config.qr-start -i ${VESPA_CONFIG_ID}`" ;; esac cmds=`echo "$qrstartcfg" | perl -ne 's/^(\w+)\.(\w+) (.*)/$1_$2=$3/ && print'` diff --git a/vespaclient/src/perl/lib/Yahoo/Vespa/VespaModel.pm b/vespaclient/src/perl/lib/Yahoo/Vespa/VespaModel.pm index fd324540bba..18af0bbdecd 100644 --- a/vespaclient/src/perl/lib/Yahoo/Vespa/VespaModel.pm +++ b/vespaclient/src/perl/lib/Yahoo/Vespa/VespaModel.pm @@ -162,7 +162,7 @@ sub setModelRetrievalFunction { # (Function) } sub retrieveModelConfigDefault { # () my $VESPA_HOME= $ENV{'VESPA_HOME'}; - my $cmd = ${VESPA_HOME} . '/bin/vespa-get-config -n cloud.config.model -i admin/model'; + my $cmd = ${VESPA_HOME} . '/bin/vespa-get-config -l -n cloud.config.model -i admin/model'; if (defined $CONFIG_REQUEST_TIMEOUT) { $cmd .= " -w $CONFIG_REQUEST_TIMEOUT"; |