summaryrefslogtreecommitdiffstats
path: root/configserver/src
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2017-11-27 10:59:59 +0100
committerGitHub <noreply@github.com>2017-11-27 10:59:59 +0100
commit03995db800c3099f46b9f71de74e92109631fc3e (patch)
treec5757dd0bd6d0af369832812a7451b2008ef7d53 /configserver/src
parent4404ea9163674ab70378479a8762e1ae3fa92eb1 (diff)
parent0e958dd5517cdee3fd22de4e0a6ce167055bad79 (diff)
Merge pull request #4280 from vespa-engine/hmusum/add-setting-for-disabling-filedsitributor
Add setting for turning off file distributor
Diffstat (limited to 'configserver/src')
-rwxr-xr-xconfigserver/src/main/sh/start-filedistribution2
1 files changed, 1 insertions, 1 deletions
diff --git a/configserver/src/main/sh/start-filedistribution b/configserver/src/main/sh/start-filedistribution
index bb8599f2bc9..a0cf1971215 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" ]; then
+if [ "$multitenant" = "true" -a "$disable_filedistributor" = "false" ]; then
foo=`${ROOT}/libexec/vespa/vespa-config.pl -mkfiledistributorconfig`
PIDFILE_FILEDISTRIBUTOR=var/run/filedistributor.pid
LOGFILE="${ROOT}/logs/vespa/vespa.log"