Skip to content

Commit d79188b

Browse files
authored
Merge pull request #190 from kbst/fixlogs
Revert including file name and line in logs lines
2 parents 63d50ff + 430b514 commit d79188b

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

kustomize/manifest.go

+2-4
Original file line numberDiff line numberDiff line change
@@ -334,12 +334,10 @@ func (km *kManifest) waitDeleted(t time.Duration) error {
334334
func (km *kManifest) fmtErr(err error) error {
335335
pc, _, _, _ := runtime.Caller(1)
336336
fn := runtime.FuncForPC(pc)
337-
name, line := fn.FileLine(pc)
338337

339338
return fmt.Errorf(
340-
"%s:%d %q: %s",
341-
name,
342-
line,
339+
"%s %q: %s",
340+
fn.Name(),
343341
km.id().toString(),
344342
err)
345343
}

kustomize/util.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,6 @@ func getPatch(gvk k8sschema.GroupVersionKind, original []byte, modified []byte,
131131
func logError(m error) error {
132132
pc, _, _, _ := runtime.Caller(1)
133133
fn := runtime.FuncForPC(pc)
134-
name, line := fn.FileLine(pc)
135134

136-
return fmt.Errorf("%s:%d: %s", name, line, m)
135+
return fmt.Errorf("%s: %s", fn.Name(), m)
137136
}

0 commit comments

Comments
 (0)