mirror of
https://gitea.com/gitea/act_runner.git
synced 2026-03-03 10:20:20 +00:00
catch panic in finally (#68)
This commit is contained in:
@@ -223,13 +223,15 @@ func (e Executor) IfBool(conditional bool) Executor {
|
||||
|
||||
// Finally adds an executor to run after other executor
|
||||
func (e Executor) Finally(finally Executor) Executor {
|
||||
return func(ctx context.Context) error {
|
||||
err := e(ctx)
|
||||
err2 := finally(ctx)
|
||||
if err2 != nil {
|
||||
return fmt.Errorf("Error occurred running finally: %v (original error: %v)", err2, err)
|
||||
}
|
||||
return err
|
||||
return func(ctx context.Context) (err error) {
|
||||
defer func() {
|
||||
err2 := finally(ctx)
|
||||
if err2 != nil {
|
||||
err = fmt.Errorf("Error occurred running finally: %v (original error: %v)", err2, err)
|
||||
}
|
||||
}()
|
||||
err = e(ctx)
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user