less noisy, more readable trace logging

5 files changed, 19 insertions, 11 deletions

diff --git a/client/go/trace/trace.go b/client/go/trace/trace.go
index 9752341a402..cedd1bcf597 100644
--- a/client/go/trace/trace.go
+++ b/client/go/trace/trace.go
@@ -13,7 +13,8 @@ import (
 type outputLevel int
 
 const (
-	levelNone outputLevel = iota
+	levelWarning outputLevel = iota - 1
+	levelNone
 	levelInfo
 	levelTrace
 	levelDebug
@@ -30,25 +31,30 @@ func Silent() {
 	currentOutputLevel = levelNone
 }
 
-func outputStderr(l outputLevel, v ...interface{}) {
+func outputStderr(l outputLevel, n string, v ...interface{}) {
 	if l > currentOutputLevel {
 		return
 	}
-	fmt.Fprintln(os.Stderr, v...)
+	w := make([]interface{}, len(v)+1)
+	w[0] = n
+	for idx, arg := range v {
+		w[idx+1] = arg
+	}
+	fmt.Fprintln(os.Stderr, w...)
 }
 
 func Info(v ...interface{}) {
-	outputStderr(levelInfo, v...)
+	outputStderr(levelInfo, "[info]", v...)
 }
 
 func Trace(v ...interface{}) {
-	outputStderr(levelTrace, v...)
+	outputStderr(levelTrace, "[trace]", v...)
 }
 
 func Debug(v ...interface{}) {
-	outputStderr(levelDebug, v...)
+	outputStderr(levelDebug, "[debug]", v...)
 }
 
 func Warning(v ...interface{}) {
-	fmt.Fprintln(os.Stderr, v...)
+	outputStderr(levelWarning, "[warning]", v...)
 }
diff --git a/client/go/util/fix_fs.go b/client/go/util/fix_fs.go
index a62b76bede5..552585e4d20 100644
--- a/client/go/util/fix_fs.go
+++ b/client/go/util/fix_fs.go
@@ -79,7 +79,7 @@ func (spec *FixSpec) FixDir(dirName string) {
 	if err != nil {
 		JustExitWith(err)
 	}
-	trace.Trace("directory ok:", dirName)
+	trace.Debug("directory ok:", dirName)
 }
 
 // ensure file gets correct owner/permissions if it exists
diff --git a/client/go/util/setrlimit.go b/client/go/util/setrlimit.go
index 6a78e47d35b..71e5676a7a0 100644
--- a/client/go/util/setrlimit.go
+++ b/client/go/util/setrlimit.go
@@ -65,7 +65,8 @@ func SetResourceLimit(resource ResourceId, newVal uint64) {
 	err = unix.Setrlimit(int(resource), &wanted)
 	if err != nil {
 		trace.Trace("Failed setting resource limit:", err)
-	} else {
+	} else if (current.Cur != wanted.Cur) || (current.Max != wanted.Max) {
+		trace.Debug("Resource limit", resource, "was:", readableLimit(current.Cur), "/", readableLimit(current.Max))
 		trace.Trace("Resource limit", resource, "adjusted OK:", readableLimit(wanted.Cur), "/", readableLimit(wanted.Max))
 	}
 }
diff --git a/client/go/vespa/find_home.go b/client/go/vespa/find_home.go
index 02ebc5cc1a1..29e0ca494f3 100644
--- a/client/go/vespa/find_home.go
+++ b/client/go/vespa/find_home.go
@@ -21,7 +21,6 @@ const (
 func FindHome() string {
 	// use env var if it is set:
 	if ev := os.Getenv("VESPA_HOME"); ev != "" {
-		trace.Debug("VH set:", ev)
 		return ev
 	}
 	// some helper functions...
diff --git a/client/go/vespa/load_env.go b/client/go/vespa/load_env.go
index c8f66b4fc24..4057e68b6f1 100644
--- a/client/go/vespa/load_env.go
+++ b/client/go/vespa/load_env.go
@@ -265,7 +265,9 @@ type pathBuilder struct {
 
 func (builder *pathBuilder) applyTo(receiver loadEnvReceiver) {
 	newPath := strings.Join(builder.curPath, ":")
-	trace.Trace("updating PATH in environment =>", newPath)
+	if newPath != receiver.currentValue(ENV_PATH) {
+		trace.Trace("updating PATH in environment =>", newPath)
+	}
 	receiver.overrideVar(ENV_PATH, newPath)
 }