Merge pull request #146 from ltratt/carry_on_after_tmp_failure

ltratt · web-flow · commit bb114940ef23 · 2026-04-27T09:27:59.000Z
Temporary failures do not mean that the queue is empty.
diff --git a/src/jobrunner.rs b/src/jobrunner.rs
@@ -293,11 +293,10 @@ impl JobRunner {
                         check_queue = false;
                         tmp_failure = false;
                     }
-                    (true, true) => {
+                    (false | true, true) => {
                         check_queue = true;
                         tmp_failure = true;
                     }
-                    (false, true) => unreachable!(),
                 }
             }
         }
@@ -336,7 +335,7 @@ impl JobRunner {
                         Err(Some(qj)) => {
                             // The job couldn't be run for temporary reasons: we'll retry later.
                             queue.push_front(qj);
-                            return (true, true);
+                            return (false, true);
                         }
                         Err(None) => {
                             // The job couldn't be run for permanent reasons: it has been consumed

Original file line number	Diff line number	Diff line change
`@@ -293,11 +293,10 @@ impl JobRunner {`
`293`	`293`	`check_queue = false;`
`294`	`294`	`tmp_failure = false;`
`295`	`295`	`}`
`296`		`- (true, true) => {`
	`296`	`+ (false \| true, true) => {`
`297`	`297`	`check_queue = true;`
`298`	`298`	`tmp_failure = true;`
`299`	`299`	`}`
`300`		`- (false, true) => unreachable!(),`
`301`	`300`	`}`
`302`	`301`	`}`
`303`	`302`	`}`
`@@ -336,7 +335,7 @@ impl JobRunner {`
`336`	`335`	`Err(Some(qj)) => {`
`337`	`336`	`// The job couldn't be run for temporary reasons: we'll retry later.`
`338`	`337`	`queue.push_front(qj);`
`339`		`- return (true, true);`
	`338`	`+ return (false, true);`
`340`	`339`	`}`
`341`	`340`	`Err(None) => {`
`342`	`341`	`// The job couldn't be run for permanent reasons: it has been consumed`