diff options
| -rw-r--r-- | client/go/jvm/env.go | 5 | ||||
| -rwxr-xr-x | standalone-container/src/main/sh/standalone-container.sh | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/client/go/jvm/env.go b/client/go/jvm/env.go index a23606e6d0d..dbc957e3ccb 100644 --- a/client/go/jvm/env.go +++ b/client/go/jvm/env.go @@ -15,10 +15,13 @@ import ( func (opts *Options) exportEnvSettings(ps *prog.Spec) { c := opts.container vespaHome := defaults.VespaHome() - vlt := fmt.Sprintf("file:%s/logs/vespa/vespa.log", vespaHome) + lvd := fmt.Sprintf("%s/logs/vespa", vespaHome) + vlt := fmt.Sprintf("file:%s/vespa.log", lvd) lcd := fmt.Sprintf("%s/var/db/vespa/logcontrol", vespaHome) lcf := fmt.Sprintf("%s/%s.logcontrol", lcd, c.ServiceName()) dlp := fmt.Sprintf("%s/lib64", vespaHome) + opts.fixSpec.FixDir(lvd) + opts.fixSpec.FixDir(lcd) ps.Setenv(envvars.VESPA_LOG_TARGET, vlt) ps.Setenv(envvars.VESPA_LOG_CONTROL_DIR, lcd) ps.Setenv(envvars.VESPA_LOG_CONTROL_FILE, lcf) diff --git a/standalone-container/src/main/sh/standalone-container.sh b/standalone-container/src/main/sh/standalone-container.sh index 56ceab18dac..c81302c9a2a 100755 --- a/standalone-container/src/main/sh/standalone-container.sh +++ b/standalone-container/src/main/sh/standalone-container.sh @@ -124,6 +124,7 @@ StartCommand() { fi local pidfile="${VESPA_HOME}/var/run/$service.pid" + FixDataDirectory "$(dirname "$pidfile")" if [ "$force" = false ] && test -r "$pidfile"; then echo "$service is already running as PID $(< "$pidfile") according to $pidfile" return @@ -152,7 +153,6 @@ StartCommand() { # may be invoked w/o path. In any case, checkjava verifies bare 'java'. checkjava - FixDataDirectory "$(dirname "$pidfile")" local vespa_log="${VESPA_HOME}/logs/vespa/vespa.log" export VESPA_LOG_TARGET="file:$vespa_log" |