diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-11-10 14:53:19 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-10 14:53:19 +0100 |
commit | e17924f98564bb17badfc02804069d8e1c480822 (patch) | |
tree | 3b74aed8d19f2a9b197ce99ad7608b8b03656116 /client | |
parent | 80b02d27ed096a9f209598b35efcd7163e013466 (diff) | |
parent | fc14f6ad10dbfdf5158e3b7d7ef6602eb3e9c8c8 (diff) |
Merge pull request #24824 from vespa-engine/arnej/readable-tracing
less noisy, more readable trace logging
Diffstat (limited to 'client')
-rw-r--r-- | client/go/trace/trace.go | 20 | ||||
-rw-r--r-- | client/go/util/fix_fs.go | 2 | ||||
-rw-r--r-- | client/go/util/setrlimit.go | 3 | ||||
-rw-r--r-- | client/go/vespa/find_home.go | 1 | ||||
-rw-r--r-- | client/go/vespa/load_env.go | 4 |
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 7c42c6d4728..381b7fb5c0b 100644 --- a/client/go/vespa/load_env.go +++ b/client/go/vespa/load_env.go @@ -269,7 +269,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) } |