Merge pull request #322 from ackintosh/race-condition

Fix race condition in FlatFileDriver::popMessage()
bernardphp · Aug 17, 2017 · 0a53868 · 0a53868
2 parents 5681d3e + a1f98f0
commit 0a53868
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/src/Driver/FlatFileDriver.php b/src/Driver/FlatFileDriver.php
@@ -102,10 +102,9 @@ public function popMessage($queueName, $duration = 5)
         while (microtime(true) < $runtime) {
             if ($files) {
                 $id = array_pop($files);
-                $data = array(file_get_contents($queueDir.DIRECTORY_SEPARATOR.$id), $id);
-                rename($queueDir.DIRECTORY_SEPARATOR.$id, $queueDir.DIRECTORY_SEPARATOR.$id.'.proceed');
-
-                return $data;
+                if (@rename($queueDir.DIRECTORY_SEPARATOR.$id, $queueDir.DIRECTORY_SEPARATOR.$id.'.proceed')) {
+                    return array(file_get_contents($queueDir.DIRECTORY_SEPARATOR.$id.'.proceed'), $id);
+                }
             }
 
             usleep(1000);