feat: add jitter to worker max runtime

.travis.yml

@@ -6,56 +6,38 @@ php:
   - 5.6
 
 env:
-  - CAKE_VERSION=2.6
-  - CAKE_VERSION=2.7
+  global:
+    - REPO_NAME=cakephp-queue
+    - PLUGIN_NAME=Queue
+    - REQUIRE=""
+
+  matrix:
+    - DB=mysql CAKE_VERSION=2.7
+    - DB=mysql CAKE_VERSION=2.8
 
 matrix:
   include:
     - php: 5.4
       env:
-        - PHPCS=1
-
-  allow_failures:
-    - php: 5.4
-      env:
-        - PHPCS=1
+        - DB=mysql CAKE_VERSION=2.7 COVERALLS=1
 
 before_script:
-  - sh -c "if [ '$PHPCS' != '1' ]; then git clone --depth 1 --branch $CAKE_VERSION git://github.com/cakephp/cakephp ../cakephp; else git clone --depth 1 --branch 2.6 git://github.com/cakephp/cakephp ../cakephp; fi" && cd ../cakephp
-  - rm -R app
-  - git clone --depth 1 --branch master git://github.com/dereuromark/tools-app app
-  - git clone --depth 1 --branch master git://github.com/dereuromark/cakephp-tools plugins/Tools
-  - git clone --depth 1 --branch master git://github.com/dereuromark/cakephp-shim plugins/Shim
-  - cp -R ../cakephp-queue plugins/Queue
-  - sh -c "mysql -e 'CREATE DATABASE cakephp_test;'"
-  - mkdir ./app/tmp
-  - mkdir ./app/tmp/logs
-  - mkdir ./app/tmp/queue
-  - mkdir ./app/tmp/tests
-  - mkdir ./app/tmp/cache
-  - mkdir ./app/tmp/cache/persistent
-  - mkdir ./app/tmp/cache/models
-  - chmod -R 0777 ./app/tmp
-  - sh -c "if [ '$PHPCS' = '1' ]; then pear channel-discover pear.cakephp.org; fi"
-  - sh -c "if [ '$PHPCS' = '1' ]; then pear install --alldeps cakephp/CakePHP_CodeSniffer; fi"
-  - phpenv rehash
-  - echo "<?php
-    class DATABASE_CONFIG {
-    public \$test = array(
-      'datasource' => 'Database/Mysql',
-      'database' => 'cakephp_test',
-      'host' => '0.0.0.0',
-      'login' => 'travis',
-      'persistent' => false,
-    );
-    }" > app/Config/database.php
-  - sh -c "if [ '$TRAVIS_PHP_VERSION' != '5.2' ]; then composer global require 'phpunit/phpunit=3.7.33'; fi"
-  - sh -c "if [ '$TRAVIS_PHP_VERSION' != '5.2' ]; then ln -s ~/.composer/vendor/phpunit/phpunit/PHPUnit ./vendors/PHPUnit; fi"
-  - cd app
+  - git clone -b master https://github.com/FriendsOfCake/travis.git --depth 1 ../travis
+  - ../travis/before_script.sh
+  - cd ../cakephp/app
+  - composer require --dev --no-interaction --prefer-source dereuromark/cakephp-tools:0.*
+  - echo "<?php App::uses('MyModel', 'Tools.Model'); class AppModel extends MyModel {}" > Model/AppModel.php
+  - echo "<?php App::uses('MyController', 'Tools.Controller'); class AppController extends MyController {}" > Controller/AppController.php
+  - echo "<?php App::uses('BaseEmailConfig', 'Tools.Config'); class EmailConfig extends BaseEmailConfig {}" > Config/email.php
+  - echo "Configure::write('Security.salt', 'AycG93b0qyJfIxfs2guVoUubWwvniR2G0FgaC9mi');" >> Config/bootstrap.php
+  - echo "Configure::write('Security.cipherSeed', '16659201697453542496749683615');" >> Config/bootstrap.php
+  - cd ..
 
 script:
-  - sh -c "if [ '$PHPCS' != '1' ]; then ../lib/Cake/Console/cake test Queue AllQueue --stderr; fi"
-  - sh -c "if [ '$PHPCS' = '1' ]; then cd ..; phpcs -p --extensions=php --standard=CakePHP ./plugins/Queue; fi"
+  - ../travis/script.sh
+
+after_success:
+  - ../travis/after_success.sh
 
 notifications:
   email: false

Config/Migration/1453822680_adding_priority_field_to_queue_tasks.php

@@ -0,0 +1,60 @@
+<?php
+class AddingPriorityFieldToQueueTasks extends CakeMigration {
+
+/**
+ * Migration description
+ *
+ * @var string
+ */
+	public $description = 'adding_priority_field_to_queue_tasks';
+
+/**
+ * Actions to be performed
+ *
+ * @var array $migration
+ */
+	public $migration = array(
+		'up' => array(
+            'create_field' => [
+                'queued_tasks' => [
+                    'priority' => [
+                        'type' => 'integer',
+                        'null' => false,
+                        'default' => 5,
+						'length' => 4
+                    ],
+					'indexes' => array(
+						'priority' => array('column' => 'priority'),
+					),
+                ],
+            ]
+		),
+		'down' => array(
+            'drop_field' => [
+                'queued_tasks' => [
+                    'priority'
+                ],
+            ]
+		),
+	);
+
+/**
+ * Before migration callback
+ *
+ * @param string $direction Direction of migration process (up or down)
+ * @return bool Should process continue
+ */
+	public function before($direction) {
+		return true;
+	}
+
+/**
+ * After migration callback
+ *
+ * @param string $direction Direction of migration process (up or down)
+ * @return bool Should process continue
+ */
+	public function after($direction) {
+		return true;
+	}
+}

Config/queue.php

@@ -37,5 +37,5 @@
 	'log' => true,
 
 	// set to false to disable (tmp = file in TMP dir)
-	'notify' => 'tmp'
+	'notify' => 'tmp',
 ];

Console/Command/CronShell.php

@@ -110,7 +110,7 @@ public function main() {
 	}
 
 /**
- * Look for a Queue Task of hte passed name and try to call add() on it.
+ * Look for a Queue Task of the passed name and try to call add() on it.
  * A QueueTask may provide an add function to enable the user to create new jobs via commandline.
  *
  * @return void