Skip to content

Commit a85c5ab

Browse files
authored
fix potential sqlite lock #1680
2 parents 2bb8b3a + 36f02c0 commit a85c5ab

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

models/webhook.go

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -612,18 +612,16 @@ func (t *HookTask) deliver() {
612612
// TODO: shoot more hooks at same time.
613613
func DeliverHooks() {
614614
tasks := make([]*HookTask, 0, 10)
615-
x.
616-
Where("is_delivered=?", false).
617-
Iterate(new(HookTask),
618-
func(idx int, bean interface{}) error {
619-
t := bean.(*HookTask)
620-
t.deliver()
621-
tasks = append(tasks, t)
622-
return nil
623-
})
615+
err := x.Where("is_delivered=?", false).Find(&tasks)
616+
if err != nil {
617+
log.Error(4, "DeliverHooks: %v", err)
618+
return
619+
}
624620

625621
// Update hook task status.
626622
for _, t := range tasks {
623+
t.deliver()
624+
627625
if err := UpdateHookTask(t); err != nil {
628626
log.Error(4, "UpdateHookTask [%d]: %v", t.ID, err)
629627
}

0 commit comments

Comments
 (0)