Merge pull request #12 from Symplicity/cancel-job

add ability to cancel processing jobs

lib/Resque/Job.php

@@ -251,6 +251,24 @@ public function fail($exception)
 		Resque_Stat::incr('failed:' . $this->worker);
 	}
 
+	public function cancel($exception)
+	{
+		Resque_Event::trigger('onCancel', array(
+			'exception' => $exception,
+			'job' => $this,
+		));
+
+		$this->updateStatus(Resque_Job_Status::STATUS_CANCELLED, $exception);
+		Resque_Failure::create(
+			$this->payload,
+			$exception,
+			$this->worker,
+			$this->queue
+		);
+		Resque_Stat::incr('failed');
+		Resque_Stat::incr('failed:' . $this->worker);
+	}
+
 	/**
 	 * Re-queue the current job.
 	 * @return string

lib/Resque/Job/Status.php

@@ -12,6 +12,7 @@ class Resque_Job_Status
 	const STATUS_RUNNING = 2;
 	const STATUS_FAILED = 3;
 	const STATUS_COMPLETE = 4;
+	const STATUS_CANCELLED = 5;
 	const STATUS_EXPIRE_SECS = 600;
 
 	/**
@@ -92,7 +93,7 @@ public function update($status, $data, $exception=null)
 		if(!$this->isTracking()) {
 			return;
 		}
-		
+
 		$now = time();
 
 		$statusPacket = array(