DevFW-CICD/garm
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Simplify logic

Browse source 
Signed-off-by: Gabriel Adrian Samfira <gsamfira@cloudbasesolutions.com>
This commit is contained in:
Gabriel Adrian Samfira 2024-07-04 14:33:32 +00:00
parent 5b24b9e56b
commit a2c606b87d
2 changed files with 21 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

21
database/sql/jobs.go
View file

@ -142,11 +142,10 @@ func (s *sqlDatabase) LockJob(_ context.Context, jobID int64, entityID string) e
}
asParams, err := sqlWorkflowJobToParamsJob(workflowJob)
if err == nil {
s.sendNotify(common.JobEntityType, common.UpdateOperation, asParams)
} else {
slog.With(slog.Any("error", err)).Error("failed to convert job to params")
if err != nil {
return errors.Wrap(err, "converting job")
}
s.sendNotify(common.JobEntityType, common.UpdateOperation, asParams)
return nil
}
@ -172,11 +171,10 @@ func (s *sqlDatabase) BreakLockJobIsQueued(_ context.Context, jobID int64) (err
return errors.Wrap(err, "saving job")
}
asParams, err := sqlWorkflowJobToParamsJob(workflowJob)
if err == nil {
s.sendNotify(common.JobEntityType, common.UpdateOperation, asParams)
} else {
slog.With(slog.Any("error", err)).Error("failed to convert job to params")
if err != nil {
return errors.Wrap(err, "converting job")
}
s.sendNotify(common.JobEntityType, common.UpdateOperation, asParams)
return nil
}
@ -206,11 +204,10 @@ func (s *sqlDatabase) UnlockJob(_ context.Context, jobID int64, entityID string)
}
asParams, err := sqlWorkflowJobToParamsJob(workflowJob)
if err == nil {
s.sendNotify(common.JobEntityType, common.UpdateOperation, asParams)
} else {
slog.With(slog.Any("error", err)).Error("failed to convert job to params")
if err != nil {
return errors.Wrap(err, "converting job")
}
s.sendNotify(common.JobEntityType, common.UpdateOperation, asParams)
return nil
}