Merge pull request #1 from CurtK/features/priority

Adding priority field to queued taskes, using cakeDC migrations to ad…

Author: Symphosize

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;
+	}
+}

Model/QueuedTask.php

@@ -11,6 +11,8 @@
  */
 class QueuedTask extends QueueAppModel {
 
+	public $_next_priority = 5;
+
 	public $rateHistory = [];
 
 	public $exit = false;
@@ -61,6 +63,12 @@ public function initConfig() {
 		Configure::write('Queue', $conf);
 	}
 
+	public function nextPriority($priority)
+	{
+		$this->_next_priority = $priority;
+		return $this;
+	}
+
 /**
  * Add a new Job to the Queue.
  *
@@ -76,8 +84,10 @@ public function createJob($jobName, $data = null, $notBefore = null, $group = nu
 			'jobtype' => $jobName,
 			'data' => serialize($data),
 			'group' => $group,
-			'reference' => $reference
+			'reference' => $reference,
+			'priority' => $this->_next_priority
 		];
+		$this->_next_priority = 5; // reset to default;
 		if ($notBefore !== null) {
 			$data['notbefore'] = date('Y-m-d H:i:s', strtotime($notBefore));
 		}
@@ -119,6 +129,7 @@ public function requestJob($capabilities, $group = null) {
 				'age',
 			],
 			'order' => [
+				'priority ASC',
 				'age ASC',
 				'id ASC'
 			],