resque / php-resque

lib/Resque/Worker.php

Spacing +40 added lines, -40 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(ticks = 1);
+declare(ticks=1);
 
 /**
  * Resque worker that handles checking queues for jobs, fetching them
@@ -76,14 +76,14 @@ 
     {
         $this->logger = new Resque_Log();
 
-        if(!is_array($queues)) {
+        if (!is_array($queues)) {
             $queues = array($queues);
         }
 
         $this->queues = $queues;
         $this->hostname = php_uname('n');
 
-        $this->id = $this->hostname . ':'.getmypid() . ':' . implode(',', $this->queues);
+        $this->id = $this->hostname . ':' . getmypid() . ':' . implode(',', $this->queues);
     }
 
 	/**
@@ -102,12 +102,12 @@ 
 	public static function all()
 	{
 		$workers = Resque::redis()->smembers('workers');
-		if(!is_array($workers)) {
+		if (!is_array($workers)) {
 			$workers = array();
 		}
 
 		$instances = array();
-		foreach($workers as $workerId) {
+		foreach ($workers as $workerId) {
 			$instances[] = self::find($workerId);
 		}
 		return $instances;
@@ -132,7 +132,7 @@ 
 	 */
 	public static function find($workerId)
 	{
-		if(!self::exists($workerId) || false === strpos($workerId, ":")) {
+		if (!self::exists($workerId) || false === strpos($workerId, ":")) {
 			return false;
 		}
 
@@ -166,12 +166,12 @@ 
 		$this->updateProcLine('Starting');
 		$this->startup();
 
-        if(function_exists('pcntl_signal_dispatch')) {
+        if (function_exists('pcntl_signal_dispatch')) {
             pcntl_signal_dispatch();
         }
 
-		while(true) {
-			if($this->shutdown) {
+		while (true) {
+			if ($this->shutdown) {
 				break;
 			}
 
@@ -189,8 +189,8 @@ 
 
 			// Attempt to find and reserve a job
 			$job = false;
-			if(!$this->paused) {
-				if($blocking === true) {
+			if (!$this->paused) {
+				if ($blocking === true) {
 					$this->logger->log(Psr\Log\LogLevel::INFO, 'Starting blocking with timeout of {interval}', array('interval' => $interval));
 					$this->updateProcLine('Waiting with blocking timeout ' . $interval);
 				} else {
@@ -200,17 +200,17 @@ 
 				$job = $this->reserve($blocking, $interval);
 			}
 
-			if(!$job) {
+			if (!$job) {
 				// For an interval of 0, break now - helps with unit testing etc
-				if($interval == 0) {
+				if ($interval == 0) {
 					break;
 				}
 
-				if($blocking === false)
+				if ($blocking === false)
 				{
 					// If no job was found, we sleep for $interval before continuing and checking again
 					$this->logger->log(Psr\Log\LogLevel::INFO, 'Sleeping for {interval}', array('interval' => $interval));
-					if($this->paused) {
+					if ($this->paused) {
 						$this->updateProcLine('Paused');
 					}
 					else {
@@ -235,13 +235,13 @@ 
 				$this->updateProcLine($status);
 				$this->logger->log(Psr\Log\LogLevel::INFO, $status);
 
-				if(!empty($job->payload['id'])) {
+				if (!empty($job->payload['id'])) {
 					Resque_Job_PID::create($job->payload['id']);
 				}
 
 				$this->perform($job);
 
-				if(!empty($job->payload['id'])) {
+				if (!empty($job->payload['id'])) {
 					Resque_Job_PID::del($job->payload['id']);
 				}
 
@@ -250,7 +250,7 @@ 
 				}
 			}
 
-			if($this->child > 0) {
+			if ($this->child > 0) {
 				// Parent process, sit and wait
 				$status = 'Forked ' . $this->child . ' at ' . date('Y-m-d H:i:s');
 				$this->updateProcLine($status);
@@ -258,7 +258,7 @@ 
 
 				// Wait until the child process finishes before continuing
 				while (pcntl_wait($status, WNOHANG) === 0) {
-					if(function_exists('pcntl_signal_dispatch')) {
+					if (function_exists('pcntl_signal_dispatch')) {
 			            pcntl_signal_dispatch();
 			        }
 
@@ -302,12 +302,12 @@ 
 			Resque_Event::trigger('afterFork', $job);
 			$result = $job->perform();
 		}
-		catch(Exception $e) {
+		catch (Exception $e) {
 			$this->logger->log(Psr\Log\LogLevel::CRITICAL, '{job} has failed {exception}', array('job' => $job, 'exception' => $e));
 			$job->fail($e);
 			return;
 		}
-		catch(Error $e) {
+		catch (Error $e) {
 			$this->logger->log(Psr\Log\LogLevel::CRITICAL, '{job} has failed {exception}', array('job' => $job, 'exception' => $e));
 			$job->fail($e);
 			return;
@@ -331,26 +331,26 @@ 
 		}
 
 		$queues = $this->queues();
-		if(!is_array($queues)) {
+		if (!is_array($queues)) {
 			return;
 		}
 
-		if($blocking === true) {
-		    if(empty($queues)){
+		if ($blocking === true) {
+		    if (empty($queues)) {
                 $this->logger->log(Psr\Log\LogLevel::INFO, 'No queue was found, sleeping for {interval}', array('interval' => $timeout));
                 usleep($timeout * 1000000);
                 return false;
             }
 			$job = Resque_Job::reserveBlocking($queues, $timeout);
-			if($job) {
+			if ($job) {
 				$this->logger->log(Psr\Log\LogLevel::INFO, 'Found job on {queue}', array('queue' => $job->queue));
 				return $job;
 			}
 		} else {
-			foreach($queues as $queue) {
+			foreach ($queues as $queue) {
 				$this->logger->log(Psr\Log\LogLevel::INFO, 'Checking {queue} for jobs', array('queue' => $queue));
 				$job = Resque_Job::reserve($queue);
-				if($job) {
+				if ($job) {
 					$this->logger->log(Psr\Log\LogLevel::INFO, 'Found job on {queue}', array('queue' => $job->queue));
 					return $job;
 				}
@@ -373,7 +373,7 @@ 
 	 */
 	public function queues($fetch = true)
 	{
-		if(!in_array('*', $this->queues) || $fetch == false) {
+		if (!in_array('*', $this->queues) || $fetch == false) {
 			return $this->queues;
 		}
 
@@ -403,10 +403,10 @@ 
 	private function updateProcLine($status)
 	{
 		$processTitle = static::$processPrefix . '-' . Resque::VERSION . ' (' . implode(',', $this->queues) . '): ' . $status;
-		if(function_exists('cli_set_process_title') && PHP_OS !== 'Darwin') {
+		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);
 		}
 	}
@@ -421,7 +421,7 @@ 
 	 */
 	private function registerSigHandlers()
 	{
-		if(!function_exists('pcntl_signal')) {
+		if (!function_exists('pcntl_signal')) {
 			return;
 		}
 
@@ -486,13 +486,13 @@ 
 	 */
 	public function killChild()
 	{
-		if(!$this->child) {
+		if (!$this->child) {
 			$this->logger->log(Psr\Log\LogLevel::DEBUG, 'No child to kill.');
 			return;
 		}
 
 		$this->logger->log(Psr\Log\LogLevel::INFO, 'Killing child at {child}', array('child' => $this->child));
-		if(exec('ps -o pid,s -p ' . $this->child, $output, $returnCode) && $returnCode != 1) {
+		if (exec('ps -o pid,s -p ' . $this->child, $output, $returnCode) && $returnCode != 1) {
 			$this->logger->log(Psr\Log\LogLevel::DEBUG, 'Child {child} found, killing.', array('child' => $this->child));
 			posix_kill($this->child, SIGKILL);
 			$this->child = null;
@@ -515,10 +515,10 @@ 
 	{
 		$workerPids = $this->workerPids();
 		$workers = self::all();
-		foreach($workers as $worker) {
+		foreach ($workers as $worker) {
 			if (is_object($worker)) {
 				list($host, $pid, $queues) = explode(':', (string)$worker, 3);
-				if($host != $this->hostname || in_array($pid, $workerPids) || $pid == getmypid()) {
+				if ($host != $this->hostname || in_array($pid, $workerPids) || $pid == getmypid()) {
 					continue;
 				}
 				$this->logger->log(Psr\Log\LogLevel::INFO, 'Pruning dead worker: {worker}', array('worker' => (string)$worker));
@@ -538,14 +538,14 @@ 
 		$pids = array();
 		if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
 			exec('WMIC path win32_process get Processid,Commandline | findstr resque | findstr /V findstr', $cmdOutput);
-			foreach($cmdOutput as $line) {
+			foreach ($cmdOutput as $line) {
 				$line = preg_replace('/\s+/m', ' ', $line);
-				list(,,$pids[]) = explode(' ', trim($line), 3);
+				list(,, $pids[]) = explode(' ', trim($line), 3);
 			}
 		}
 		else {
 			exec('ps -A -o pid,args | grep [r]esque', $cmdOutput);
-			foreach($cmdOutput as $line) {
+			foreach ($cmdOutput as $line) {
 				list($pids[],) = explode(' ', trim($line), 2);
 			}
 		}
@@ -566,7 +566,7 @@ 
 	 */
 	public function unregisterWorker()
 	{
-		if(is_object($this->currentJob)) {
+		if (is_object($this->currentJob)) {
 			$this->currentJob->fail(new Resque_Job_DirtyExitException);
 		}
 
@@ -626,7 +626,7 @@ 
 	public function job()
 	{
 		$job = Resque::redis()->get('worker:' . $this);
-		if(!$job) {
+		if (!$job) {
 			return array();
 		}
 		else {

lib/ResqueScheduler/Worker.php

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, "** [" . date('H:i:s Y-m-d') . "] " . $message . "\n");
 		}
 	}
@@ -152,7 +152,7 @@ 
 	 */
 	private function registerSigHandlers()
 	{
-		if(!function_exists('pcntl_signal')) {
+		if (!function_exists('pcntl_signal')) {
 			return;
 		}
 

Braces +1 added lines, -2 removed lines

@@ -137,8 +137,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, "** [" . date('H:i:s Y-m-d') . "] " . $message . "\n");
 		}
 	}