femsci/forgejo
femsci/forgejo
1
0
Fork 0
forked from NYANDEV/forgejo
Code Pull requests Activity

Fix data-race bug when accessing task.LastRun (#27584) (#27586)

Browse source 
Backport #27584 by @wxiaoguang

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
This commit is contained in:
Giteabot 2023-10-11 23:27:38 +08:00 committed by GitHub
parent 7ec7c733c7
commit 844ab9a441
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
services/cron/cron.go
View file

@ -107,12 +107,11 @@ func ListTasks() TaskTable {
prev = e.PreviousRun() prev = e.PreviousRun()
} }
task.lock.Lock()
// If the manual run is after the cron run, use that instead. // If the manual run is after the cron run, use that instead.
if prev.Before(task.LastRun) { if prev.Before(task.LastRun) {
prev = task.LastRun prev = task.LastRun
} }
task.lock.Lock()
tTable = append(tTable, &TaskTableRow{ tTable = append(tTable, &TaskTableRow{
Name: task.Name, Name: task.Name,
Spec: spec, Spec: spec,