a
/
agola
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

executor: fix typo in setting task endTime when setup failed 

There was a typo so we weren't setting the task endTime when the setup step
failed.

Also unify all logic to just use `et` (instead of a mix of `et` or `rt.et`)
This commit is contained in:
Simone Gotti 2019-07-26 19:03:06 +02:00
parent e2526a6399
commit 0ecfc24def
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
internal/services/executor/executor.go
View File

@ -788,8 +788,8 @@ func (e *Executor) executeTask(ctx context.Context, et *types.ExecutorTask) {
if err := e.setupTask(ctx, rt); err != nil { if err := e.setupTask(ctx, rt); err != nil {
log.Errorf("err: %+v", err) log.Errorf("err: %+v", err)
rt.et.Status.Phase = types.ExecutorTaskPhaseFailed et.Status.Phase = types.ExecutorTaskPhaseFailed
et.Status.SetupStep.EndTime = util.TimePtr(time.Now()) et.Status.EndTime = util.TimePtr(time.Now())
et.Status.SetupStep.Phase = types.ExecutorTaskPhaseFailed et.Status.SetupStep.Phase = types.ExecutorTaskPhaseFailed
et.Status.SetupStep.EndTime = util.TimePtr(time.Now()) et.Status.SetupStep.EndTime = util.TimePtr(time.Now())
if err := e.sendExecutorTaskStatus(ctx, et); err != nil { if err := e.sendExecutorTaskStatus(ctx, et); err != nil {
@ -812,12 +812,12 @@ func (e *Executor) executeTask(ctx context.Context, et *types.ExecutorTask) {
rt.Lock() rt.Lock()
if err != nil { if err != nil {
log.Errorf("err: %+v", err) log.Errorf("err: %+v", err)
rt.et.Status.Phase = types.ExecutorTaskPhaseFailed et.Status.Phase = types.ExecutorTaskPhaseFailed
} else { } else {
rt.et.Status.Phase = types.ExecutorTaskPhaseSuccess et.Status.Phase = types.ExecutorTaskPhaseSuccess
} }
rt.et.Status.EndTime = util.TimePtr(time.Now()) et.Status.EndTime = util.TimePtr(time.Now())
if err := e.sendExecutorTaskStatus(ctx, et); err != nil { if err := e.sendExecutorTaskStatus(ctx, et); err != nil {
log.Errorf("err: %+v", err) log.Errorf("err: %+v", err)