Merge pull request #30 from piwik/18

Use mt_rand if available instead of rand

Queue/Manager.php

@@ -223,6 +223,23 @@ public function canAcquireMoreLocks()
         return $this->lock->getNumberOfAcquiredLocks() < $this->numQueuesAvailable;
     }
 
+    private function getRandomQueueId()
+    {
+        static $useMtRand;
+
+        if (!isset($useMtRand)) {
+            $useMtRand = function_exists('mt_rand');
+        }
+
+        if ($useMtRand) {
+            $rand = mt_rand(0, $this->numQueuesAvailable - 1);
+        } else {
+            $rand = rand(0, $this->numQueuesAvailable - 1);
+        }
+
+        return $rand;
+    }
+
     /**
      * @return Queue
      */
@@ -232,7 +249,7 @@ public function lockNext()
 
         if ($this->currentQueueId < 0) {
             // we just want to avoid to always start looking for the queue at position 0
-            $this->currentQueueId = rand(0, $this->numQueuesAvailable - 1);
+            $this->currentQueueId = $this->getRandomQueueId();
         }
 
         // here we look for all available queues whether at least one should and can be processed

README.md

@@ -134,6 +134,10 @@ __Are there any known issues?__
 
 ## Changelog
 
+0.2.5
+
+- Use a better random number generator if available on the system to more evenly process queues.
+
 0.2.4
 
 - The command `queuedtracking:monitor` will now work even when the queue is disabled

plugin.json

@@ -1,6 +1,6 @@
 {
     "name": "QueuedTracking",
-    "version": "0.2.4",
+    "version": "0.2.5",
     "description": "Scale your large traffic Piwik service by queuing tracking requests in Redis for better performance. ",
     "theme": false,
     "keywords": ["tracker", "tracking", "queue", "redis"],