github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #1410 from mlaventure/errdegs-stack

Browse Source 
errdefs: Provide a valid stack in all cases
This commit is contained in:
Stephen Day 2017-08-22 15:44:26 -07:00 committed by GitHub
commit 4015f7376f
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
errdefs/grpc.go
View File

@ -73,13 +73,11 @@ func FromGRPC(err error) error {
cls = ErrUnknown cls = ErrUnknown
} }
if cls != nil { msg := rebaseMessage(cls, err)
msg := rebaseMessage(cls, err) if msg != "" {
if msg != "" { err = errors.Wrapf(cls, msg)
err = errors.Wrapf(cls, msg) } else {
} else { err = errors.WithStack(cls)
err = cls
}
} }
return err return err