Fix incorrectly constructed query list, restore purging completed entries #46

Merged
prpr merged 1 commits from df/webif:df-queue-safer-patchv2 into master 2022-03-25 22:54:03 +00:00

View File

@ -146,7 +146,7 @@ proc {queue dbqueryl} {query_list {txn_mode ""}} {
proc {queue startup} {{days 7}} { proc {queue startup} {{days 7}} {
if {$days == 0} { set days 7 } if {$days == 0} { set days 7 }
return [queue dbqueryl { { { return [queue dbqueryl [list { {
update queue update queue
set status = 'INTERRUPTED', set status = 'INTERRUPTED',
log = 'Job will be retried automatically.', log = 'Job will be retried automatically.',
@ -163,12 +163,12 @@ proc {queue startup} {{days 7}} {
update queue update queue
set status = 'PENDING' set status = 'PENDING'
where status = 'DEFER' where status = 'DEFER'
} } { { } } [list {
delete from queue delete from queue
where status in ('COMPLETE', 'FAILED') where status in ('COMPLETE', 'FAILED')
and submitted < %s and submitted < %s
} [expr [clock seconds] - 86400 * $days] } [expr [clock seconds] - 86400 * $days]
} } ] ] ] ]
} }
proc {queue fetch} {file action} { proc {queue fetch} {file action} {