From 430b51423fe019e6681b16bcb09b84c29c6f54d6 Mon Sep 17 00:00:00 2001 From: Philipp Strube Date: Wed, 15 Jun 2022 20:27:26 +0200 Subject: [PATCH] Revert including file name and line in logs lines --- kustomize/manifest.go | 6 ++---- kustomize/util.go | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/kustomize/manifest.go b/kustomize/manifest.go index f464583..800a278 100644 --- a/kustomize/manifest.go +++ b/kustomize/manifest.go @@ -334,12 +334,10 @@ func (km *kManifest) waitDeleted(t time.Duration) error { func (km *kManifest) fmtErr(err error) error { pc, _, _, _ := runtime.Caller(1) fn := runtime.FuncForPC(pc) - name, line := fn.FileLine(pc) return fmt.Errorf( - "%s:%d %q: %s", - name, - line, + "%s %q: %s", + fn.Name(), km.id().toString(), err) } diff --git a/kustomize/util.go b/kustomize/util.go index 361bf1c..9524744 100644 --- a/kustomize/util.go +++ b/kustomize/util.go @@ -131,7 +131,6 @@ func getPatch(gvk k8sschema.GroupVersionKind, original []byte, modified []byte, func logError(m error) error { pc, _, _, _ := runtime.Caller(1) fn := runtime.FuncForPC(pc) - name, line := fn.FileLine(pc) - return fmt.Errorf("%s:%d: %s", name, line, m) + return fmt.Errorf("%s: %s", fn.Name(), m) }