janis91 / ocr

lib/Service/RedisService.php

Spacing +32 added lines, -32 removed lines

@@ -75,24 +75,24 @@ 
 	public function sendJob($job, $languages, $occDir) {
 		try {
 			// check for messaging and put everything together
-			$redis = $this->setupRedisInstance ();
+			$redis = $this->setupRedisInstance();
 			
-			$job = $this->mapper->insert ( $job );
-			$msg = json_encode ( array (
-					'id' => $job->getId (),
-					'type' => $job->getType (),
-					'source' => $job->getSource (),
-					'tempFile' => $job->getTempFile (),
+			$job = $this->mapper->insert($job);
+			$msg = json_encode(array(
+					'id' => $job->getId(),
+					'type' => $job->getType(),
+					'source' => $job->getSource(),
+					'tempFile' => $job->getTempFile(),
 					'languages' => $languages
-			) );
-			if (! $redis->lPush ( 'incoming', $msg )) {
-				throw new NotFoundException ( $this->l10n->t ( 'Could not add files to the redis OCR processing queue.' ) );
+			));
+			if (!$redis->lPush('incoming', $msg)) {
+				throw new NotFoundException($this->l10n->t('Could not add files to the redis OCR processing queue.'));
 			}
-		} catch ( Exception $e ) {
-			exec ( 'rm ' . $job->getTempFile () );
-			$job->setStatus ( 'FAILED' );
-			$this->mapper->update ( $job );
-			$this->handleException ( $e );
+		} catch (Exception $e) {
+			exec('rm ' . $job->getTempFile());
+			$job->setStatus('FAILED');
+			$this->mapper->update($job);
+			$this->handleException($e);
 		}
 	}
 	
@@ -105,28 +105,28 @@ 
 	 * @return \Redis
 	 */
 	private function setupRedisInstance() {
-		if (! extension_loaded ( 'redis' )) {
-			$this->logger->debug ( 'It seems that the message queueing capabilities are not available in your local php installation. Please install php-redis.', [ 
+		if (!extension_loaded('redis')) {
+			$this->logger->debug('It seems that the message queueing capabilities are not available in your local php installation. Please install php-redis.', [ 
 					'app' => 'ocr' 
-			] );
-			throw new NotFoundException ( $this->l10n->t ( 'Message queueing capabilities are missing on the server.' ) );
+			]);
+			throw new NotFoundException($this->l10n->t('Message queueing capabilities are missing on the server.'));
 		}
 		
-		$redis = new \Redis ();
+		$redis = new \Redis();
 		// TODO: get from config
-		if (! $redis->connect ( '127.0.0.1', 6379, 2.5, NULL, 100 )) {
-			$this->logger->debug ( 'Cannot connect to Redis.', [ 
+		if (!$redis->connect('127.0.0.1', 6379, 2.5, NULL, 100)) {
+			$this->logger->debug('Cannot connect to Redis.', [ 
 					'app' => 'ocr' 
-			] );
-			throw new NotFoundException ( $this->l10n->t ( 'Cannot connect to Redis.' ) );
+			]);
+			throw new NotFoundException($this->l10n->t('Cannot connect to Redis.'));
 		}
-		if (! $redis->select ( 0 )) {
-			$this->logger->debug ( 'Cannot connect to the right Redis database.', [
+		if (!$redis->select(0)) {
+			$this->logger->debug('Cannot connect to the right Redis database.', [
 					'app' => 'ocr'
-			] );
-			throw new NotFoundException ( $this->l10n->t ( 'Cannot connect to the right Redis database.' ) );
+			]);
+			throw new NotFoundException($this->l10n->t('Cannot connect to the right Redis database.'));
 		}
-		$redis->setOption ( \Redis::OPT_PREFIX, 'ocr:' );
+		$redis->setOption(\Redis::OPT_PREFIX, 'ocr:');
 		
 		return $redis;
 	}
@@ -139,12 +139,12 @@ 
 	 * @throws NotFoundException
 	 */
 	private function handleException($e) {
-		$this->logger->logException ( $e, [ 
+		$this->logger->logException($e, [ 
 				'app' => 'ocr',
 				'message' => 'Exception during message queue processing' 
-		] );
+		]);
 		if ($e instanceof NotFoundException) {
-			throw new NotFoundException ( $e->getMessage () );
+			throw new NotFoundException($e->getMessage());
 		} else {
 			throw $e;
 		}