gather names of environment variables in one place

3 files changed, 17 insertions, 30 deletions

diff --git a/client/go/jvm/application_container.go b/client/go/jvm/application_container.go
index 2387ad66269..924a47f1997 100644
--- a/client/go/jvm/application_container.go
+++ b/client/go/jvm/application_container.go
@@ -8,6 +8,7 @@ import (
 	"os"
 
 	"github.com/vespa-engine/vespa/client/go/defaults"
+	"github.com/vespa-engine/vespa/client/go/envvars"
 	"github.com/vespa-engine/vespa/client/go/trace"
 	"github.com/vespa-engine/vespa/client/go/util"
 )
@@ -144,7 +145,7 @@ func (a *ApplicationContainer) configureCPU(qc *QrStartConfig) {
 func (a *ApplicationContainer) configureOptions() {
 	opts := a.JvmOptions()
 	opts.AddOption("-Dconfig.id=" + a.ConfigId())
-	if env := os.Getenv(VESPA_CONTAINER_JVMARGS); env != "" {
+	if env := os.Getenv(envvars.VESPA_CONTAINER_JVMARGS); env != "" {
 		opts.AddJvmArgsFromString(env)
 	}
 	qrStartCfg := a.getQrStartCfg()
diff --git a/client/go/jvm/env.go b/client/go/jvm/env.go
index 3db0cfd17b4..97050bcca7c 100644
--- a/client/go/jvm/env.go
+++ b/client/go/jvm/env.go
@@ -7,41 +7,27 @@ import (
 	"fmt"
 
 	"github.com/vespa-engine/vespa/client/go/defaults"
+	"github.com/vespa-engine/vespa/client/go/envvars"
 	"github.com/vespa-engine/vespa/client/go/prog"
 	"github.com/vespa-engine/vespa/client/go/util"
 )
 
-const (
-	ENV_JDISC_EXPORT        = "jdisc_export_packages"
-	JAVAVM_LD_PRELOAD       = "JAVAVM_LD_PRELOAD"
-	PRELOAD                 = "PRELOAD"
-	VESPA_CONTAINER_JVMARGS = "VESPA_CONTAINER_JVMARGS"
-	VESPA_LOG_CONTROL_DIR   = "VESPA_LOG_CONTROL_DIR"
-	VESPA_LOG_TARGET        = "VESPA_LOG_TARGET"
-
-	LD_LIBRARY_PATH    = util.ENV_LD_LIBRARY_PATH
-	LD_PRELOAD         = util.ENV_LD_PRELOAD
-	VESPA_CONFIG_ID    = util.ENV_CONFIG_ID
-	VESPA_SERVICE_NAME = util.ENV_SERVICE_NAME
-	MALLOC_ARENA_MAX   = util.ENV_MALLOC_ARENA_MAX
-)
-
 func (c *containerBase) exportEnvSettings(ps *prog.Spec) {
 	vespaHome := defaults.VespaHome()
 	vlt := fmt.Sprintf("file:%s/logs/vespa/vespa.log", vespaHome)
 	lcd := fmt.Sprintf("%s/var/db/vespa/logcontrol", vespaHome)
 	dlp := fmt.Sprintf("%s/lib64", vespaHome)
-	ps.Setenv(VESPA_LOG_TARGET, vlt)
-	ps.Setenv(VESPA_LOG_CONTROL_DIR, lcd)
-	ps.Setenv(VESPA_SERVICE_NAME, c.ServiceName())
-	ps.Setenv(LD_LIBRARY_PATH, dlp)
-	ps.Setenv(MALLOC_ARENA_MAX, "1")
-	if preload := ps.Getenv(PRELOAD); preload != "" {
-		ps.Setenv(JAVAVM_LD_PRELOAD, preload)
-		ps.Setenv(LD_PRELOAD, preload)
+	ps.Setenv(envvars.VESPA_LOG_TARGET, vlt)
+	ps.Setenv(envvars.VESPA_LOG_CONTROL_DIR, lcd)
+	ps.Setenv(envvars.VESPA_SERVICE_NAME, c.ServiceName())
+	ps.Setenv(envvars.LD_LIBRARY_PATH, dlp)
+	ps.Setenv(envvars.MALLOC_ARENA_MAX, "1")
+	if preload := ps.Getenv(envvars.PRELOAD); preload != "" {
+		ps.Setenv(envvars.JAVAVM_LD_PRELOAD, preload)
+		ps.Setenv(envvars.LD_PRELOAD, preload)
 	}
 	if c.ConfigId() != "" {
-		ps.Setenv(VESPA_CONFIG_ID, c.ConfigId())
+		ps.Setenv(envvars.VESPA_CONFIG_ID, c.ConfigId())
 	}
 	util.OptionallyReduceTimerFrequency()
 }
diff --git a/client/go/jvm/run.go b/client/go/jvm/run.go
index 01111e8a1a4..d0ce2f72988 100644
--- a/client/go/jvm/run.go
+++ b/client/go/jvm/run.go
@@ -6,15 +6,15 @@ package jvm
 import (
 	"os"
 
+	"github.com/vespa-engine/vespa/client/go/envvars"
 	"github.com/vespa-engine/vespa/client/go/trace"
-	"github.com/vespa-engine/vespa/client/go/util"
 )
 
 func RunApplicationContainer(extraArgs []string) int {
-	if doTrace := os.Getenv("TRACE_JVM_STARTUP"); doTrace != "" {
+	if doTrace := os.Getenv(envvars.TRACE_JVM_STARTUP); doTrace != "" {
 		trace.AdjustVerbosity(1)
 	}
-	if doDebug := os.Getenv("DEBUG_JVM_STARTUP"); doDebug != "" {
+	if doDebug := os.Getenv(envvars.DEBUG_JVM_STARTUP); doDebug != "" {
 		trace.AdjustVerbosity(2)
 	}
 	container := NewApplicationContainer(extraArgs)
@@ -25,8 +25,8 @@ func RunApplicationContainer(extraArgs []string) int {
 
 func NewApplicationContainer(extraArgs []string) Container {
 	var a ApplicationContainer
-	a.configId = os.Getenv(util.ENV_CONFIG_ID)
-	a.serviceName = os.Getenv(util.ENV_SERVICE_NAME)
+	a.configId = os.Getenv(envvars.VESPA_CONFIG_ID)
+	a.serviceName = os.Getenv(envvars.VESPA_SERVICE_NAME)
 	a.jvmArgs = NewOptions(&a)
 	a.configureOptions()
 	for _, x := range extraArgs {