resque / php-resque

lib/ResqueScheduler.php

Indentation +49 added lines, -49 removed lines

@@ -91,59 +91,59 @@
 		return Resque::redis()->llen('delayed:' . $timestamp, $timestamp);
 	}
 
-    /**
-     * Remove a delayed job from the queue
-     *
-     * note: you must specify exactly the same
-     * queue, class and arguments that you used when you added
-     * to the delayed queue
-     *
-     * also, this is an expensive operation because all delayed keys have tobe
-     * searched
-     *
-     * @param $queue
-     * @param $class
-     * @param $args
-     * @return int number of jobs that were removed
-     */
-    public static function removeDelayed($queue, $class, $args)
-    {
-       $destroyed=0;
-       $item=json_encode(self::jobToHash($queue, $class, $args));
-       $redis=Resque::redis();
+	/**
+	 * Remove a delayed job from the queue
+	 *
+	 * note: you must specify exactly the same
+	 * queue, class and arguments that you used when you added
+	 * to the delayed queue
+	 *
+	 * also, this is an expensive operation because all delayed keys have tobe
+	 * searched
+	 *
+	 * @param $queue
+	 * @param $class
+	 * @param $args
+	 * @return int number of jobs that were removed
+	 */
+	public static function removeDelayed($queue, $class, $args)
+	{
+	   $destroyed=0;
+	   $item=json_encode(self::jobToHash($queue, $class, $args));
+	   $redis=Resque::redis();
 
-       foreach($redis->keys('delayed:*') as $key)
-       {
-           $key=$redis->removePrefix($key);
-           $destroyed+=$redis->lrem($key,0,$item);
-       }
+	   foreach($redis->keys('delayed:*') as $key)
+	   {
+		   $key=$redis->removePrefix($key);
+		   $destroyed+=$redis->lrem($key,0,$item);
+	   }
 
-       return $destroyed;
-    }
+	   return $destroyed;
+	}
 
-    /**
-     * removed a delayed job queued for a specific timestamp
-     *
-     * note: you must specify exactly the same
-     * queue, class and arguments that you used when you added
-     * to the delayed queue
-     *
-     * @param $timestamp
-     * @param $queue
-     * @param $class
-     * @param $args
-     * @return mixed
-     */
-    public static function removeDelayedJobFromTimestamp($timestamp, $queue, $class, $args)
-    {
-        $key = 'delayed:' . self::getTimestamp($timestamp);
-        $item = json_encode(self::jobToHash($queue, $class, $args));
-        $redis = Resque::redis();
-        $count = $redis->lrem($key, 0, $item);
-        self::cleanupTimestamp($key, $timestamp);
+	/**
+	 * removed a delayed job queued for a specific timestamp
+	 *
+	 * note: you must specify exactly the same
+	 * queue, class and arguments that you used when you added
+	 * to the delayed queue
+	 *
+	 * @param $timestamp
+	 * @param $queue
+	 * @param $class
+	 * @param $args
+	 * @return mixed
+	 */
+	public static function removeDelayedJobFromTimestamp($timestamp, $queue, $class, $args)
+	{
+		$key = 'delayed:' . self::getTimestamp($timestamp);
+		$item = json_encode(self::jobToHash($queue, $class, $args));
+		$redis = Resque::redis();
+		$count = $redis->lrem($key, 0, $item);
+		self::cleanupTimestamp($key, $timestamp);
 
-        return $count;
-    }
+		return $count;
+	}
 	
 	/**
 	 * Generate hash of all job properties to be saved in the scheduled queue.

Spacing +6 added lines, -6 removed lines

@@ -108,14 +108,14 @@
      */
     public static function removeDelayed($queue, $class, $args)
     {
-       $destroyed=0;
-       $item=json_encode(self::jobToHash($queue, $class, $args));
-       $redis=Resque::redis();
+       $destroyed = 0;
+       $item = json_encode(self::jobToHash($queue, $class, $args));
+       $redis = Resque::redis();
 
-       foreach($redis->keys('delayed:*') as $key)
+       foreach ($redis->keys('delayed:*') as $key)
        {
-           $key=$redis->removePrefix($key);
-           $destroyed+=$redis->lrem($key,0,$item);
+           $key = $redis->removePrefix($key);
+           $destroyed += $redis->lrem($key, 0, $item);
        }
 
        return $destroyed;

Braces +2 added lines, -4 removed lines

@@ -220,8 +220,7 @@ 
 	{
 		if ($at === null) {
 			$at = time();
-		}
-		else {
+		} else {
 			$at = self::getTimestamp($at);
 		}
 	
@@ -261,8 +260,7 @@ 
 	{
 		if (empty($class)) {
 			throw new Resque_Exception('Jobs must be given a class.');
-		}
-		else if (empty($queue)) {
+		} else if (empty($queue)) {
 			throw new Resque_Exception('Jobs must be put in a queue.');
 		}
 		

lib/ResqueScheduler/Worker.php

Braces +1 added lines, -2 removed lines

@@ -119,8 +119,7 @@
 	{
 		if($this->logLevel == self::LOG_NORMAL) {
 			fwrite(STDOUT, "*** " . $message . "\n");
-		}
-		else if($this->logLevel == self::LOG_VERBOSE) {
+		} else if($this->logLevel == self::LOG_VERBOSE) {
 			fwrite(STDOUT, "** [" . strftime('%T %Y-%m-%d') . "] " . $message . "\n");
 		}
 	}

Indentation +7 added lines, -7 removed lines

@@ -36,13 +36,13 @@
 	private $paused = false;
 
 	/**
-	* The primary loop for a worker.
-	*
-	* Every $interval (seconds), the scheduled queue will be checked for jobs
-	* that should be pushed to Resque.
-	*
-	* @param int $interval How often to check schedules.
-	*/
+	 * The primary loop for a worker.
+	 *
+	 * Every $interval (seconds), the scheduled queue will be checked for jobs
+	 * that should be pushed to Resque.
+	 *
+	 * @param int $interval How often to check schedules.
+	 */
 	public function work($interval = null)
 	{
 		if ($interval !== null) {

Spacing +8 added lines, -8 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(ticks = 1);
+declare(ticks=1);
 
 /**
  * ResqueScheduler worker to handle scheduling of delayed tasks.
@@ -53,10 +53,10 @@ 
 		$this->registerSigHandlers();
 
 		while (true) {
-			if($this->shutdown) {
+			if ($this->shutdown) {
 				break;
 			}
-			if(!$this->paused) {
+			if (!$this->paused) {
 				$this->handleDelayedItems();
 			}
 			$this->sleep();
@@ -91,7 +91,7 @@ 
 	{
 		$item = null;
 		while ($item = ResqueScheduler::nextItemForTimestamp($timestamp)) {
-			$this->log('queueing ' . $item['class'] . ' in ' . $item['queue'] .' [delayed]');
+			$this->log('queueing ' . $item['class'] . ' in ' . $item['queue'] . ' [delayed]');
 			
 			Resque_Event::trigger('beforeDelayedEnqueue', array(
 				'queue' => $item['queue'],
@@ -123,7 +123,7 @@ 
 	 */
 	private function updateProcLine($status)
 	{
-		if(function_exists('setproctitle')) {
+		if (function_exists('setproctitle')) {
 			setproctitle('resque-scheduler-' . ResqueScheduler::VERSION . ': ' . $status);
 		}
 	}
@@ -135,10 +135,10 @@ 
 	 */
 	public function log($message)
 	{
-		if($this->logLevel == self::LOG_NORMAL) {
+		if ($this->logLevel == self::LOG_NORMAL) {
 			fwrite(STDOUT, "*** " . $message . "\n");
 		}
-		else if($this->logLevel == self::LOG_VERBOSE) {
+		else if ($this->logLevel == self::LOG_VERBOSE) {
 			fwrite(STDOUT, "** [" . strftime('%T %Y-%m-%d') . "] " . $message . "\n");
 		}
 	}
@@ -152,7 +152,7 @@ 
 	 */
 	private function registerSigHandlers()
 	{
-		if(!function_exists('pcntl_signal')) {
+		if (!function_exists('pcntl_signal')) {
 			return;
 		}
 

lib/Resque/Job.php

Spacing +13 added lines, -13 removed lines

@@ -64,7 +64,7 @@ 
 			$id = Resque::generateJobId();
 		}
 
-		if($args !== null && !is_array($args)) {
+		if ($args !== null && !is_array($args)) {
 			throw new InvalidArgumentException(
 				'Supplied $args must be an array.'
 			);
@@ -77,7 +77,7 @@ 
 			'queue_time' => microtime(true),
 		));
 
-		if($monitor) {
+		if ($monitor) {
 			Resque_Job_Status::create($id, $prefix);
 		}
 
@@ -94,7 +94,7 @@ 
 	public static function reserve($queue)
 	{
 		$payload = Resque::pop($queue);
-		if(!is_array($payload)) {
+		if (!is_array($payload)) {
 			return false;
 		}
 
@@ -113,7 +113,7 @@ 
 	{
 		$item = Resque::blpop($queues, $timeout);
 
-		if(!is_array($item)) {
+		if (!is_array($item)) {
 			return false;
 		}
 
@@ -127,7 +127,7 @@ 
 	 */
 	public function updateStatus($status, $result = null)
 	{
-		if(empty($this->payload['id'])) {
+		if (empty($this->payload['id'])) {
 			return;
 		}
 
@@ -142,7 +142,7 @@ 
 	 */
 	public function getStatus()
 	{
-		if(empty($this->payload['id'])) {
+		if (empty($this->payload['id'])) {
 			return null;
 		}
 
@@ -194,20 +194,20 @@ 
 			Resque_Event::trigger('beforePerform', $this);
 
 			$instance = $this->getInstance();
-			if(is_callable([$instance, 'setUp'])) {
+			if (is_callable([$instance, 'setUp'])) {
 				$instance->setUp();
 			}
 
 			$result = $instance->perform();
 
-			if(is_callable([$instance, 'tearDown'])) {
+			if (is_callable([$instance, 'tearDown'])) {
 				$instance->tearDown();
 			}
 
 			Resque_Event::trigger('afterPerform', $this);
 		}
 		// beforePerform/setUp have said don't perform this job. Return.
-		catch(Resque_Job_DontPerform $e) {
+		catch (Resque_Job_DontPerform $e) {
 			$result = false;
 		}
 
@@ -255,7 +255,7 @@ 
 		$monitor = false;
 		if (!empty($this->payload['id'])) {
 			$status = new Resque_Job_Status($this->payload['id'], $this->getPrefix());
-			if($status->isTracking()) {
+			if ($status->isTracking()) {
 				$monitor = true;
 			}
 		}
@@ -271,13 +271,13 @@ 
 	public function __toString()
 	{
 		$name = array(
-			'Job{' . $this->queue .'}'
+			'Job{' . $this->queue . '}'
 		);
-		if(!empty($this->payload['id'])) {
+		if (!empty($this->payload['id'])) {
 			$name[] = 'ID: ' . $this->payload['id'];
 		}
 		$name[] = $this->payload['class'];
-		if(!empty($this->payload['args'])) {
+		if (!empty($this->payload['args'])) {
 			$name[] = json_encode($this->payload['args']);
 		}
 		return '(' . implode(' | ', $name) . ')';