diff options
| author | Arne H Juul <arnej@yahoo-inc.com> | 2016-07-07 14:01:14 +0200 |
|---|---|---|
| committer | Arne H Juul <arnej@yahoo-inc.com> | 2016-07-07 14:01:14 +0200 |
| commit | 5b63a058c63a3055a67d91b12b9ae75eae82f928 (patch) | |
| tree | c0a939c4a9ec5b2a7d6af7f3118b34c0706d9cab /config-proxy | |
| parent | 2cf46bafea51a5e22195ae445ab474da8ebe318a (diff) | |
use new code to find configservers
* use binary from vespa_defaults instead of old perl code.
This is mainly to allow VESPA_CONFIGSERVERS environment
configuration to work.
* Also, remove duplicate sourcing of common-env.sh
Diffstat (limited to 'config-proxy')
| -rwxr-xr-x | config-proxy/src/main/sh/config-ctl | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/config-proxy/src/main/sh/config-ctl b/config-proxy/src/main/sh/config-ctl index 36155560d8d..3264a18ddec 100755 --- a/config-proxy/src/main/sh/config-ctl +++ b/config-proxy/src/main/sh/config-ctl @@ -64,9 +64,6 @@ ROOT=$VESPA_HOME export ROOT cd $ROOT || { echo "Cannot cd to $ROOT" 1>&2; exit 1; } -# get common PATH: -. $ROOT/libexec/vespa/common-env.sh - P_SENTINEL=var/run/sentinel.pid P_CONFIG_PROXY=var/run/configproxy.pid @@ -105,7 +102,7 @@ export LD_LIBRARY_PATH="$VESPA_HOME/lib64" case $1 in start) - configsources=`libexec/vespa/vespa-config.pl -configsources` + configsources=`bin/vespa-print-default configservers_rpc` userargs=$vespa_base__jvmargs_configproxy if [ "$userargs" == "" ]; then userargs=$services__jvmargs_configproxy |