diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-11-27 13:25:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-27 13:25:05 +0100 |
| commit | b87c7b57179497299d3c7011b6b616838361e284 (patch) | |
| tree | 087a1140bb9da637fdc5e3ed213a66435dda34f1 | |
| parent | 3d3d44e357246d9f23c3face130729a52c0fb37b (diff) | |
| parent | 7dc90a4dc2865b22c1a62359bf0d86ecc2beb8e5 (diff) | |
Merge pull request #4282 from vespa-engine/hmusum/fix-start-filedistribution-on-config-server
Make sure file distributor is started when disable_filedistributor is…
| -rwxr-xr-x | configserver/src/main/sh/start-filedistribution | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configserver/src/main/sh/start-filedistribution b/configserver/src/main/sh/start-filedistribution index a0cf1971215..1995e59de4e 100755 --- a/configserver/src/main/sh/start-filedistribution +++ b/configserver/src/main/sh/start-filedistribution @@ -63,7 +63,7 @@ ROOT=${VESPA_HOME%/} VESPA_CONFIG_ID="dir:${ROOT}/conf/filedistributor" export VESPA_CONFIG_ID -if [ "$multitenant" = "true" -a "$disable_filedistributor" = "false" ]; then +if [ "$multitenant" = "true" ] && [ "$disable_filedistributor" = "" ] || [ "$disable_filedistributor" = "false" ]; then foo=`${ROOT}/libexec/vespa/vespa-config.pl -mkfiledistributorconfig` PIDFILE_FILEDISTRIBUTOR=var/run/filedistributor.pid LOGFILE="${ROOT}/logs/vespa/vespa.log" |