resque / php-resque

demo/job.php

Indentation +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 {
 	public function perform()
 	{
-        fwrite(STDOUT, 'Start job! -> ');
+		fwrite(STDOUT, 'Start job! -> ');
 		sleep(1);
 		fwrite(STDOUT, 'Job ended!' . PHP_EOL);
 	}

demo/queue.php

Indentation +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 if (empty($argv[2])) {
 	$jobId = Resque::enqueue('default', $argv[1], $args, true);
 } else {
-        $jobId = Resque::enqueue($argv[1], $argv[2], $args, true);	
+		$jobId = Resque::enqueue($argv[1], $argv[2], $args, true);	
 }
 
 echo "Queued job ".$jobId."\n\n";

lib/Resque.php

Indentation +37 added lines, -37 removed lines

@@ -10,7 +10,7 @@ 
 {
 	const VERSION = '1.2';
 
-    const DEFAULT_INTERVAL = 5;
+	const DEFAULT_INTERVAL = 5;
 
 	/**
 	 * @var Resque_Redis Instance of Resque_Redis that talks to redis.
@@ -122,7 +122,7 @@ 
 	 */
 	public static function pop($queue)
 	{
-        $item = self::redis()->lpop('queue:' . $queue);
+		$item = self::redis()->lpop('queue:' . $queue);
 
 		if(!$item) {
 			return;
@@ -140,11 +140,11 @@ 
 	 */
 	public static function dequeue($queue, $items = Array())
 	{
-	    if(count($items) > 0) {
+		if(count($items) > 0) {
 		return self::removeItems($queue, $items);
-	    } else {
+		} else {
 		return self::removeList($queue);
-	    }
+		}
 	}
 
 	/**
@@ -155,9 +155,9 @@ 
 	 */
 	public static function removeQueue($queue)
 	{
-	    $num = self::removeList($queue);
-	    self::redis()->srem('queues', $queue);
-	    return $num;
+		$num = self::removeList($queue);
+		self::redis()->srem('queues', $queue);
+		return $num;
 	}
 
 	/**
@@ -170,28 +170,28 @@ 
 	 */
 	public static function blpop(array $queues, $timeout)
 	{
-	    $list = array();
-	    foreach($queues AS $queue) {
+		$list = array();
+		foreach($queues AS $queue) {
 		$list[] = 'queue:' . $queue;
-	    }
+		}
 
-	    $item = self::redis()->blpop($list, (int)$timeout);
+		$item = self::redis()->blpop($list, (int)$timeout);
 
-	    if(!$item) {
+		if(!$item) {
 		return;
-	    }
+		}
 
-	    /**
-	     * Normally the Resque_Redis class returns queue names without the prefix
-	     * But the blpop is a bit different. It returns the name as prefix:queue:name
-	     * So we need to strip off the prefix:queue: part
-	     */
-	    $queue = substr($item[0], strlen(self::redis()->getPrefix() . 'queue:'));
+		/**
+		 * Normally the Resque_Redis class returns queue names without the prefix
+		 * But the blpop is a bit different. It returns the name as prefix:queue:name
+		 * So we need to strip off the prefix:queue: part
+		 */
+		$queue = substr($item[0], strlen(self::redis()->getPrefix() . 'queue:'));
 
-	    return array(
+		return array(
 		'queue'   => $queue,
 		'payload' => json_decode($item[1], true)
-	    );
+		);
 	}
 
 	/**
@@ -304,7 +304,7 @@ 
 		while (!$finished) {
 			$string = self::redis()->rpoplpush($requeueQueue, self::redis()->getPrefix() .$originalQueue);
 			if (empty($string)) {
-			    $finished = true;
+				$finished = true;
 			}
 		}
 
@@ -327,29 +327,29 @@ 
 	 */
 	private static function matchItem($string, $items)
 	{
-	    $decoded = json_decode($string, true);
+		$decoded = json_decode($string, true);
 
-	    foreach($items as $key => $val) {
+		foreach($items as $key => $val) {
 		# class name only  ex: item[0] = ['class']
 		if (is_numeric($key)) {
-		    if($decoded['class'] == $val) {
+			if($decoded['class'] == $val) {
 			return true;
-		    }
+			}
 		# class name with args , example: item[0] = ['class' => {'foo' => 1, 'bar' => 2}]
-    		} elseif (is_array($val)) {
-		    $decodedArgs = (array)$decoded['args'][0];
-		    if ($decoded['class'] == $key &&
+			} elseif (is_array($val)) {
+			$decodedArgs = (array)$decoded['args'][0];
+			if ($decoded['class'] == $key &&
 			count($decodedArgs) > 0 && count(array_diff($decodedArgs, $val)) == 0) {
 			return true;
 			}
 		# class name with ID, example: item[0] = ['class' => 'id']
 		} else {
-		    if ($decoded['class'] == $key && $decoded['id'] == $val) {
+			if ($decoded['class'] == $key && $decoded['id'] == $val) {
 			return true;
-		    }
+			}
+		}
 		}
-	    }
-	    return false;
+		return false;
 	}
 
 	/**
@@ -362,9 +362,9 @@ 
 	 */
 	private static function removeList($queue)
 	{
-	    $counter = self::size($queue);
-	    $result = self::redis()->del('queue:' . $queue);
-	    return ($result == 1) ? $counter : 0;
+		$counter = self::size($queue);
+		$result = self::redis()->del('queue:' . $queue);
+		return ($result == 1) ? $counter : 0;
 	}
 
 	/*

Braces +1 added lines, -2 removed lines

@@ -227,8 +227,7 @@
 		);
 		try {
 			Resque_Event::trigger('beforeEnqueue', $hookParams);
-		}
-		catch(Resque_Job_DontCreate $e) {
+		} catch(Resque_Job_DontCreate $e) {
 			return false;
 		}
 

lib/Resque/Job.php

Indentation +13 added lines, -13 removed lines

@@ -169,9 +169,9 @@ 
 			return $this->instance;
 		}
 
-        $this->instance = $this->getJobFactory()->create($this->payload['class'], $this->getArguments(), $this->queue);
-        $this->instance->job = $this;
-        return $this->instance;
+		$this->instance = $this->getJobFactory()->create($this->payload['class'], $this->getArguments(), $this->queue);
+		$this->instance->job = $this;
+		return $this->instance;
 	}
 
 	/**
@@ -276,14 +276,14 @@ 
 		return $this;
 	}
 
-    /**
-     * @return Resque_Job_FactoryInterface
-     */
-    public function getJobFactory()
-    {
-        if ($this->jobFactory === null) {
-            $this->jobFactory = new Resque_Job_Factory();
-        }
-        return $this->jobFactory;
-    }
+	/**
+	 * @return Resque_Job_FactoryInterface
+	 */
+	public function getJobFactory()
+	{
+		if ($this->jobFactory === null) {
+			$this->jobFactory = new Resque_Job_Factory();
+		}
+		return $this->jobFactory;
+	}
 }

lib/Resque/Worker.php

Indentation +26 added lines, -26 removed lines

@@ -12,8 +12,8 @@ 
 class Resque_Worker
 {
 	/**
-	* @var LoggerInterface Logging object that impliments the PSR-3 LoggerInterface
-	*/
+	 * @var LoggerInterface Logging object that impliments the PSR-3 LoggerInterface
+	 */
 	public $logger;
 
 	/**
@@ -56,30 +56,30 @@ 
 	 */
 	private $child = null;
 
-    /**
-     * Instantiate a new worker, given a list of queues that it should be working
-     * on. The list of queues should be supplied in the priority that they should
-     * be checked for jobs (first come, first served)
-     *
-     * Passing a single '*' allows the worker to work on all queues in alphabetical
-     * order. You can easily add new queues dynamically and have them worked on using
-     * this method.
-     *
-     * @param string|array $queues String with a single queue name, array with multiple.
-     */
-    public function __construct($queues)
-    {
-        $this->logger = new Resque_Log();
-
-        if(!is_array($queues)) {
-            $queues = array($queues);
-        }
-
-        $this->queues = $queues;
-        $this->hostname = php_uname('n');
-
-        $this->id = $this->hostname . ':'.getmypid() . ':' . implode(',', $this->queues);
-    }
+	/**
+	 * Instantiate a new worker, given a list of queues that it should be working
+	 * on. The list of queues should be supplied in the priority that they should
+	 * be checked for jobs (first come, first served)
+	 *
+	 * Passing a single '*' allows the worker to work on all queues in alphabetical
+	 * order. You can easily add new queues dynamically and have them worked on using
+	 * this method.
+	 *
+	 * @param string|array $queues String with a single queue name, array with multiple.
+	 */
+	public function __construct($queues)
+	{
+		$this->logger = new Resque_Log();
+
+		if(!is_array($queues)) {
+			$queues = array($queues);
+		}
+
+		$this->queues = $queues;
+		$this->hostname = php_uname('n');
+
+		$this->id = $this->hostname . ':'.getmypid() . ':' . implode(',', $this->queues);
+	}
 
 	/**
 	 * Return all workers known to Resque as instantiated instances.

Braces +6 added lines, -12 removed lines

@@ -182,8 +182,7 @@ 
 					$this->logger->log(Psr\Log\LogLevel::INFO, 'Sleeping for {interval}', array('interval' => $interval));
 					if($this->paused) {
 						$this->updateProcLine('Paused');
-					}
-					else {
+					} else {
 						$this->updateProcLine('Waiting for ' . implode(',', $this->queues));
 					}
 
@@ -225,8 +224,7 @@ 
 					$job->fail(new Resque_Job_DirtyExitException(
 						'Job exited with exit code ' . $exitStatus
 					));
-				}
-				else
+				} else
 				{
 					if (in_array($job->getStatus(), array(Resque_Job_Status::STATUS_WAITING, Resque_Job_Status::STATUS_RUNNING)))
 					{
@@ -253,8 +251,7 @@ 
 		try {
 			Resque_Event::trigger('afterFork', $job);
 			$job->perform();
-		}
-		catch(Exception $e) {
+		} catch(Exception $e) {
 			$this->logger->log(Psr\Log\LogLevel::CRITICAL, '{job} has failed {stack}', array('job' => $job, 'stack' => $e));
 			$job->fail($e);
 			return;
@@ -347,8 +344,7 @@ 
 		$processTitle = 'resque-' . Resque::VERSION . ': ' . $status;
 		if(function_exists('cli_set_process_title') && PHP_OS !== 'Darwin') {
 			cli_set_process_title($processTitle);
-		}
-		else if(function_exists('setproctitle')) {
+		} else if(function_exists('setproctitle')) {
 			setproctitle($processTitle);
 		}
 	}
@@ -431,8 +427,7 @@ 
 			$this->logger->log(Psr\Log\LogLevel::DEBUG, 'Child {child} found, killing.', array('child' => $this->child));
 			posix_kill($this->child, SIGKILL);
 			$this->child = null;
-		}
-		else {
+		} else {
 			$this->logger->log(Psr\Log\LogLevel::INFO, 'Child {child} not found, restarting.', array('child' => $this->child));
 			$this->shutdown();
 		}
@@ -554,8 +549,7 @@ 
 		$job = Resque::redis()->get('worker:' . $this);
 		if(!$job) {
 			return array();
-		}
-		else {
+		} else {
 			return json_decode($job, true);
 		}
 	}

lib/Resque/Job/Factory.php

Indentation +24 added lines, -24 removed lines

@@ -3,30 +3,30 @@
 class Resque_Job_Factory implements Resque_Job_FactoryInterface
 {
 
-    /**
-     * @param $className
-     * @param array $args
-     * @param $queue
-     * @return Resque_JobInterface
-     * @throws \Resque_Exception
-     */
-    public function create($className, $args, $queue)
-    {
-        if (!class_exists($className)) {
-            throw new Resque_Exception(
-                'Could not find job class ' . $className . '.'
-            );
-        }
+	/**
+	 * @param $className
+	 * @param array $args
+	 * @param $queue
+	 * @return Resque_JobInterface
+	 * @throws \Resque_Exception
+	 */
+	public function create($className, $args, $queue)
+	{
+		if (!class_exists($className)) {
+			throw new Resque_Exception(
+				'Could not find job class ' . $className . '.'
+			);
+		}
 
-        if (!method_exists($className, 'perform')) {
-            throw new Resque_Exception(
-                'Job class ' . $className . ' does not contain a perform method.'
-            );
-        }
+		if (!method_exists($className, 'perform')) {
+			throw new Resque_Exception(
+				'Job class ' . $className . ' does not contain a perform method.'
+			);
+		}
 
-        $instance = new $className;
-        $instance->args = $args;
-        $instance->queue = $queue;
-        return $instance;
-    }
+		$instance = new $className;
+		$instance->args = $args;
+		$instance->queue = $queue;
+		return $instance;
+	}
 }

lib/Resque/Redis.php

Indentation +11 added lines, -11 removed lines

@@ -98,10 +98,10 @@ 
 	 */
 	public static function prefix($namespace)
 	{
-	    if (substr($namespace, -1) !== ':' && $namespace != '') {
-	        $namespace .= ':';
-	    }
-	    self::$defaultNamespace = $namespace;
+		if (substr($namespace, -1) !== ':' && $namespace != '') {
+			$namespace .= ':';
+		}
+		self::$defaultNamespace = $namespace;
 	}
 
 	/**
@@ -110,7 +110,7 @@ 
 	 *                      DSN-supplied value will be used instead and this parameter is ignored.
 	 * @param object $client Optional Credis_Cluster or Credis_Client instance instantiated by you
 	 */
-    public function __construct($server, $database = null, $client = null)
+	public function __construct($server, $database = null, $client = null)
 	{
 		try {
 			if (is_array($server)) {
@@ -255,16 +255,16 @@ 
 
 	public static function getPrefix()
 	{
-	    return self::$defaultNamespace;
+		return self::$defaultNamespace;
 	}
 
 	public static function removePrefix($string)
 	{
-	    $prefix=self::getPrefix();
+		$prefix=self::getPrefix();
 
-	    if (substr($string, 0, strlen($prefix)) == $prefix) {
-	        $string = substr($string, strlen($prefix), strlen($string) );
-	    }
-	    return $string;
+		if (substr($string, 0, strlen($prefix)) == $prefix) {
+			$string = substr($string, strlen($prefix), strlen($string) );
+		}
+		return $string;
 	}
 }

Braces +5 added lines, -10 removed lines

@@ -115,11 +115,9 @@ 
 		try {
 			if (is_array($server)) {
 				$this->driver = new Credis_Cluster($server);
-			}
-			else if (is_object($client)) {
+			} else if (is_object($client)) {
 				$this->driver = $client;
-			}
-			else {
+			} else {
 				list($host, $port, $dsnDatabase, $user, $password, $options) = self::parseDsn($server);
 				// $user is not used, only $password
 
@@ -144,8 +142,7 @@ 
 			if ($database !== null) {
 				$this->driver->select($database);
 			}
-		}
-		catch(CredisException $e) {
+		} catch(CredisException $e) {
 			throw new Resque_RedisException('Error communicating with Redis: ' . $e->getMessage(), 0, $e);
 		}
 	}
@@ -240,15 +237,13 @@ 
 				foreach ($args[0] AS $i => $v) {
 					$args[0][$i] = self::$defaultNamespace . $v;
 				}
-			}
-			else {
+			} else {
 				$args[0] = self::$defaultNamespace . $args[0];
 			}
 		}
 		try {
 			return $this->driver->__call($name, $args);
-		}
-		catch (CredisException $e) {
+		} catch (CredisException $e) {
 			throw new Resque_RedisException('Error communicating with Redis: ' . $e->getMessage(), 0, $e);
 		}
 	}