diff options
| author | Harald Musum <musum@oath.com> | 2018-01-19 08:29:56 +0100 |
|---|---|---|
| committer | Harald Musum <musum@oath.com> | 2018-01-19 08:29:56 +0100 |
| commit | 1170ace62a77e41ee5ec065c02919017941f90a8 (patch) | |
| tree | d274a1bf3525bc23824c11382b7f6a952b3e4bd8 /filedistribution | |
| parent | 6e04d1e721f4a184b4f07b29ee89ff4aa99a7db2 (diff) | |
Use status API client when filedistributor is disabled
Diffstat (limited to 'filedistribution')
| -rw-r--r-- | filedistribution/src/apps/status/vespa-status-filedistribution.sh | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/filedistribution/src/apps/status/vespa-status-filedistribution.sh b/filedistribution/src/apps/status/vespa-status-filedistribution.sh index b5f9bc291d5..65a6da89b56 100644 --- a/filedistribution/src/apps/status/vespa-status-filedistribution.sh +++ b/filedistribution/src/apps/status/vespa-status-filedistribution.sh @@ -60,7 +60,22 @@ findroot ROOT=${VESPA_HOME%/} -ZKSTRING=$($ROOT/libexec/vespa/vespa-config.pl -zkstring) -test -z "$VESPA_LOG_LEVEL" && VESPA_LOG_LEVEL=warning -export VESPA_LOG_LEVEL -exec $ROOT/bin/vespa-status-filedistribution-bin --zkstring "$ZKSTRING" $@ +if [ "$cloudconfig_server__disable_filedistributor" = "" ] || [ "$cloudconfig_server__disable_filedistributor" != "true" ]; then + ZKSTRING=$($ROOT/libexec/vespa/vespa-config.pl -zkstring) + test -z "$VESPA_LOG_LEVEL" && VESPA_LOG_LEVEL=warning + export VESPA_LOG_LEVEL + exec $ROOT/bin/vespa-status-filedistribution-bin --zkstring "$ZKSTRING" $@ +else + if [ "$cloudconfig_server__environment" != "" ]; then + environment="--environment $cloudconfig_server__environment" + fi + if [ "$cloudconfig_server__region" != "" ]; then + region="--region $cloudconfig_server__region" + fi + + defaults="--tenant default --application default --instance default" + jvmoptions="-XX:MaxJavaStackTraceDepth=-1 $(getJavaOptionsIPV46) -Xms48m -Xmx48m" + jar="-cp $VESPA_HOME/lib/jars/filedistribution-jar-with-dependencies.jar" + + exec java $jvmoptions $jar com.yahoo.vespa.filedistribution.status.FileDistributionStatusClient $defaults $environment $region "$@" +fi |