Merge pull request #49 from chadicus/master

Use milliseconds for earliestGet in ackSend()

Author: chadicus

src/Queue.php

@@ -157,7 +157,7 @@ public function get(array $query, $runningResetDuration, $waitDurationInMillis =
 
         //reset stuck messages
         $this->collection->updateMany(
-            ['running' => true, 'resetTimestamp' => ['$lte' => new \MongoDB\BSON\UTCDateTime(microtime(true) * 1000)]],
+            ['running' => true, 'resetTimestamp' => ['$lte' => new \MongoDB\BSON\UTCDateTime((int)(microtime(true) * 1000))]],
             ['$set' => ['running' => false]]
         );
 
@@ -170,7 +170,7 @@ public function get(array $query, $runningResetDuration, $waitDurationInMillis =
             $completeQuery["payload.{$key}"] = $value;
         }
 
-        $completeQuery['earliestGet'] = ['$lte' => new \MongoDB\BSON\UTCDateTime(microtime(true) * 1000)];
+        $completeQuery['earliestGet'] = ['$lte' => new \MongoDB\BSON\UTCDateTime((int)(microtime(true) * 1000))];
 
         $resetTimestamp = time() + $runningResetDuration;
         //ints overflow to floats
@@ -319,7 +319,7 @@ public function ackSend(array $message, array $payload, $earliestGet = 0, $prior
         }
 
         //Ensure $earliestGet is between 0 and MONGO_INT32_MAX
-        $earliestGet = min(max(0, $earliestGet), self::MONGO_INT32_MAX);
+        $earliestGet = min(max(0, $earliestGet * 1000), self::MONGO_INT32_MAX);
 
         $toSet = [
             'payload' => $payload,
@@ -329,7 +329,7 @@ public function ackSend(array $message, array $payload, $earliestGet = 0, $prior
             'priority' => $priority,
         ];
         if ($newTimestamp) {
-            $toSet['created'] = new \MongoDB\BSON\UTCDateTime(microtime(true) * 1000);
+            $toSet['created'] = new \MongoDB\BSON\UTCDateTime((int)(microtime(true) * 1000));
         }
 
         //using upsert because if no documents found then the doc was removed (SHOULD ONLY HAPPEN BY SOMEONE MANUALLY)
@@ -396,7 +396,7 @@ public function send(array $payload, $earliestGet = 0, $priority = 0.0)
             'resetTimestamp' => new \MongoDB\BSON\UTCDateTime(self::MONGO_INT32_MAX * 1000),
             'earliestGet' => new \MongoDB\BSON\UTCDateTime($earliestGet * 1000),
             'priority' => $priority,
-            'created' => new \MongoDB\BSON\UTCDateTime(microtime(true) * 1000),
+            'created' => new \MongoDB\BSON\UTCDateTime((int)(microtime(true) * 1000)),
         ];
 
         $this->collection->insertOne($message);

tests/QueueTest.php

@@ -482,11 +482,11 @@ public function resetStuck()
         //sets to running
         $this->collection->updateOne(
             ['payload.key' => 0],
-            ['$set' => ['running' => true, 'resetTimestamp' => new \MongoDB\BSON\UTCDateTime(microtime(true) * 1000)]]
+            ['$set' => ['running' => true, 'resetTimestamp' => new \MongoDB\BSON\UTCDateTime((int)(microtime(true) * 1000))]]
         );
         $this->collection->updateOne(
             ['payload.key' => 1],
-            ['$set' => ['running' => true, 'resetTimestamp' => new \MongoDB\BSON\UTCDateTime(microtime(true) * 1000)]]
+            ['$set' => ['running' => true, 'resetTimestamp' => new \MongoDB\BSON\UTCDateTime((int)(microtime(true) * 1000))]]
         );
 
         $this->assertSame(2, $this->collection->count(['running' => true]));