jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

genericError constructors can accept nil error 

if the error is nil, we do not populate generic error's message, but the
constructor will still return a valid error

Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com>
This commit is contained in:
Daniel, Dao Quang Minh 2015-02-27 03:50:20 -05:00
parent 4ce8d97320
commit e22b589543
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
generic_error.go
View File

@ -25,26 +25,32 @@ func newGenericError(err error, c ErrorCode) Error {
if le, ok := err.(Error); ok { if le, ok := err.(Error); ok {
return le return le
} }
return &genericError{ gerr := &genericError{
Timestamp: time.Now(), Timestamp: time.Now(),
Err: err, Err: err,
Message: err.Error(),
ECode: c, ECode: c,
Stack: stacktrace.Capture(1), Stack: stacktrace.Capture(1),
} }
if err != nil {
gerr.Message = err.Error()
}
return gerr
} }
func newSystemError(err error) Error { func newSystemError(err error) Error {
if le, ok := err.(Error); ok { if le, ok := err.(Error); ok {
return le return le
} }
return &genericError{ gerr := &genericError{
Timestamp: time.Now(), Timestamp: time.Now(),
Err: err, Err: err,
ECode: SystemError, ECode: SystemError,
Message: err.Error(),
Stack: stacktrace.Capture(1), Stack: stacktrace.Capture(1),
} }
if err != nil {
gerr.Message = err.Error()
}
return gerr
} }
type genericError struct { type genericError struct {