opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-05-17 23:26:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

pkg/errorhandling.JoinErrors: don't throw away context for lone errors

Browse Source 
When our multierror contains just one error, don't extract its text only
to rewrap it, because doing so discards any stack trace information that
might have been added closer to where the error actually originated.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
This commit is contained in:
Nalin Dahyabhai
2021-04-14 13:38:27 -04:00
parent 39a1f3a04f
commit 9b3226a80a
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/errorhandling/errorhandling.go
View File

@ -24,6 +24,9 @@ func JoinErrors(errs []error) error {
if finalErr == nil { if finalErr == nil {
return finalErr return finalErr
} }
if len(multiE.WrappedErrors()) == 1 && logrus.IsLevelEnabled(logrus.TraceLevel) {
return multiE.WrappedErrors()[0]
}
return errors.New(strings.TrimSpace(finalErr.Error())) return errors.New(strings.TrimSpace(finalErr.Error()))
} }