Merge pull request #1045 from hqhq/recursive_generic_error
Allow recrusive generic error
This commit is contained in:
commit
8b4850b8cd
|
@ -67,9 +67,6 @@ func newSystemErrorWithCause(err error, cause string) Error {
|
|||
// stack frames skipped. This is only to be called by the other functions for
|
||||
// formatting the error.
|
||||
func createSystemError(err error, cause string) Error {
|
||||
if le, ok := err.(Error); ok {
|
||||
return le
|
||||
}
|
||||
gerr := &genericError{
|
||||
Timestamp: time.Now(),
|
||||
Err: err,
|
||||
|
|
|
@ -356,7 +356,7 @@ loop:
|
|||
}
|
||||
}
|
||||
if !sentRun {
|
||||
return newSystemErrorWithCause(ierr, "container init failed")
|
||||
return newSystemErrorWithCause(ierr, "container init")
|
||||
}
|
||||
if p.config.Config.Namespaces.Contains(configs.NEWNS) && !sentResume {
|
||||
return newSystemError(fmt.Errorf("could not synchronise after executing prestart hooks with container process"))
|
||||
|
|
Loading…
Reference in New Issue