Merge pull request #34 from mhagstrand/SleepingWithDelayInQueue

chrisboulton · web-flow · commit 5954c989026f · 2016-11-28T14:38:06.000-08:00
Fix bug where scheduler sleeps when processing a delayed queue
diff --git a/lib/ResqueScheduler/Worker.php b/lib/ResqueScheduler/Worker.php
@@ -55,9 +55,9 @@ public function work($interval = null)
 	 */
 	public function handleDelayedItems($timestamp = null)
 	{
-		while (($timestamp = ResqueScheduler::nextDelayedTimestamp($timestamp)) !== false) {
+		while (($oldestJobTimestamp = ResqueScheduler::nextDelayedTimestamp($timestamp)) !== false) {
 			$this->updateProcLine('Processing Delayed Items');
-			$this->enqueueDelayedItemsForTimestamp($timestamp);
+			$this->enqueueDelayedItemsForTimestamp($oldestJobTimestamp);
 		}
 	}
 	

Original file line number	Diff line number	Diff line change
`@@ -55,9 +55,9 @@ public function work($interval = null)`
`55`	`55`	`*/`
`56`	`56`	`public function handleDelayedItems($timestamp = null)`
`57`	`57`	`{`
`58`		`- while (($timestamp = ResqueScheduler::nextDelayedTimestamp($timestamp)) !== false) {`
	`58`	`+ while (($oldestJobTimestamp = ResqueScheduler::nextDelayedTimestamp($timestamp)) !== false) {`
`59`	`59`	`$this->updateProcLine('Processing Delayed Items');`
`60`		`- $this->enqueueDelayedItemsForTimestamp($timestamp);`
	`60`	`+ $this->enqueueDelayedItemsForTimestamp($oldestJobTimestamp);`
`61`	`61`	`}`
`62`	`62`	`}`
`63`	`63`