summaryrefslogtreecommitdiffstats
path: root/client/go/jvm/container.go
diff options
context:
space:
mode:
authorArne Juul <arnej@yahooinc.com>2023-01-19 10:55:28 +0000
committerArne Juul <arnej@yahooinc.com>2023-01-20 15:18:02 +0000
commit02aabca514dc2a1f1bfe768a7939d7983bdec821 (patch)
tree7cbc5909eb5be97892887dc0ef01149e65889d9b /client/go/jvm/container.go
parenteffe4b34bb8a8740d9bf7ede11d24e2eaa0f8c15 (diff)
prepare to switch vespa-start-services script
* make it easier to start non-jdisc JVM * add hooks to start configproxy java program * add sentinel startup * port over more from common-env.sh * tune some logging levels, use spam tracing * use TRACE_STARTUP=true to get some tracing
Diffstat (limited to 'client/go/jvm/container.go')
-rw-r--r--client/go/jvm/container.go4
1 files changed, 3 insertions, 1 deletions
diff --git a/client/go/jvm/container.go b/client/go/jvm/container.go
index c755672da86..f52a34a6f6d 100644
--- a/client/go/jvm/container.go
+++ b/client/go/jvm/container.go
@@ -65,7 +65,9 @@ func (cb *containerBase) Exec() {
p := prog.NewSpec(argv)
p.ConfigureNumaCtl()
cb.JvmOptions().exportEnvSettings(p)
- writeEnvAsProperties(p.EffectiveEnv(), cb.propsFile)
+ if cb.propsFile != "" {
+ writeEnvAsProperties(p.EffectiveEnv(), cb.propsFile)
+ }
trace.Info("starting container; env:", readableEnv(p.Env))
trace.Info("starting container; exec:", argv)
err := p.Run()