queue tests

src/Jenssegers/Mongodb/Queue/MongoQueue.php

@@ -79,12 +79,21 @@ class MongoQueue extends DatabaseQueue
      */
     protected function releaseJobsThatHaveBeenReservedTooLong($queue)
     {
-        $expired = Carbon::now()->subSeconds($this->expire)->getTimestamp();
+        $expiration = Carbon::now()->subSeconds($this->expire)->getTimestamp();
+        $now = time();
 
         $reserved = $this->database->collection($this->table)
             ->where('queue', $this->getQueue($queue))
-            ->where('reserved', 1)
-            ->where('reserved_at', '<=', $expired)->get();
+            ->where(function ($query) use ($expiration, $now) {
+                // Check for available jobs
+                $query->where(function ($query) use ($now) {
+                    $query->whereNull('reserved_at');
+                    $query->where('available_at', '<=', $now);
+                });
+
+                // Check for jobs that are reserved but have expired
+                $query->orWhere('reserved_at', '<=', $expiration);
+            })->get();
 
         foreach ($reserved as $job) {
             $attempts = $job['attempts'] + 1;

tests/QueueTest.php

@@ -38,7 +38,7 @@ class QueueTest extends TestCase
 
         // Expect an attempted older job in the queue
         $job = Queue::pop('test');
-        $this->assertEquals(2, $job->getDatabaseJob()->attempts);
+        $this->assertEquals(1, $job->getDatabaseJob()->attempts);
         $this->assertGreaterThan($expiry, $job->getDatabaseJob()->reserved_at);
 
         $job->delete();