janis91 / ocr

lib/Service/RedisService.php

Spacing +38 added lines, -38 removed lines

@@ -95,9 +95,9 @@ 
 		$this->logger = $logger;
 		$this->l10n = $l10n;
 		$this->config = $config;
-		$this->redisHost = $this->config->getAppValue ( $this->appName, 'redisHost' );
-		$this->redisPort = intval ( $this->config->getAppValue ( $this->appName, 'redisPort' ) );
-		$this->redisDb = intval ( $this->config->getAppValue ( $this->appName, 'redisDb' ) );
+		$this->redisHost = $this->config->getAppValue($this->appName, 'redisHost');
+		$this->redisPort = intval($this->config->getAppValue($this->appName, 'redisPort'));
+		$this->redisDb = intval($this->config->getAppValue($this->appName, 'redisDb'));
 	}
 	
 	/**
@@ -110,25 +110,25 @@ 
 	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 ( OcrConstants::REDIS_NEW_JOBS_QUEUE, $msg )) {
-				throw new NotFoundException ( $this->l10n->t ( 'Could not add files to the redis OCR processing queue.' ) );
+			));
+			if (!$redis->lPush(OcrConstants::REDIS_NEW_JOBS_QUEUE, $msg)) {
+				throw new NotFoundException($this->l10n->t('Could not add files to the redis OCR processing queue.'));
 			}
-		} catch ( Exception $e ) {
-			$this->fileService->execRemove ( $job->getTempFile () );
-			$job->setStatus ( 'FAILED' );
-			$job->setErrorLog ( $this->l10n->t ( 'Could not add files to the redis OCR processing queue.' ) );
-			$this->mapper->update ( $job );
-			$this->handleException ( $e );
+		} catch (Exception $e) {
+			$this->fileService->execRemove($job->getTempFile());
+			$job->setStatus('FAILED');
+			$job->setErrorLog($this->l10n->t('Could not add files to the redis OCR processing queue.'));
+			$this->mapper->update($job);
+			$this->handleException($e);
 		}
 	}
 	
@@ -139,15 +139,15 @@ 
 	 */
 	public function readingFinishedJobs() {
 		try {
-			$redis = $this->setupRedisInstance ();
+			$redis = $this->setupRedisInstance();
 			
-			$result = $redis->multi ()->lRange ( OcrConstants::REDIS_FINISHED_JOBS_QUEUE, 0, - 1 )->delete ( OcrConstants::REDIS_FINISHED_JOBS_QUEUE )->exec ();
-			$this->logger->debug ( 'Retrieved the following array from redis: {result}', [ 
+			$result = $redis->multi()->lRange(OcrConstants::REDIS_FINISHED_JOBS_QUEUE, 0, - 1)->delete(OcrConstants::REDIS_FINISHED_JOBS_QUEUE)->exec();
+			$this->logger->debug('Retrieved the following array from redis: {result}', [ 
 					'result' => $result [0] 
-			] );
+			]);
 			return $result [0];
-		} catch ( Exception $e ) {
-			$this->handleException ( $e );
+		} catch (Exception $e) {
+			$this->handleException($e);
 		}
 	}
 	
@@ -158,21 +158,21 @@ 
 	 * @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.' );
-			throw new NotFoundException ( $this->l10n->t ( 'Message queueing capabilities are missing on the server.' ) );
+		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.');
+			throw new NotFoundException($this->l10n->t('Message queueing capabilities are missing on the server.'));
 		}
 		
-		$redis = new \Redis ();
-		if (! $redis->connect ( $this->redisHost, $this->redisPort, 2.5, NULL, 100 )) {
-			$this->logger->debug ( 'Cannot connect to Redis.' );
-			throw new NotFoundException ( $this->l10n->t ( 'Cannot connect to Redis.' ) );
+		$redis = new \Redis();
+		if (!$redis->connect($this->redisHost, $this->redisPort, 2.5, NULL, 100)) {
+			$this->logger->debug('Cannot connect to Redis.');
+			throw new NotFoundException($this->l10n->t('Cannot connect to Redis.'));
 		}
-		if (! $redis->select ( $this->redisDb )) {
-			$this->logger->debug ( 'Cannot connect to the right Redis database.' );
-			throw new NotFoundException ( $this->l10n->t ( 'Cannot connect to the right Redis database.' ) );
+		if (!$redis->select($this->redisDb)) {
+			$this->logger->debug('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, OcrConstants::REDIS_KEY_PREFIX );
+		$redis->setOption(\Redis::OPT_PREFIX, OcrConstants::REDIS_KEY_PREFIX);
 		
 		return $redis;
 	}
@@ -185,9 +185,9 @@ 
 	 * @throws NotFoundException
 	 */
 	private function handleException($e) {
-		$this->logger->logException ( $e, [ 
+		$this->logger->logException($e, [ 
 				'message' => 'Exception during message queue processing' 
-		] );
+		]);
 		throw $e;
 	}
 }
\ No newline at end of file

lib/Service/StatusService.php

Spacing +13 added lines, -13 removed lines

@@ -81,26 +81,26 @@ 
 	public function getStatus() {
 		try {
 			// TODO: For now this will be placed in the regular check, but in the future this could be done in another way
-			$this->jobService->checkForFinishedJobs ();
+			$this->jobService->checkForFinishedJobs();
 			
 			// returns user specific processed files
-			$processed = $this->jobMapper->findAllProcessed ( $this->userId );
-			$this->jobService->handleProcessed ();
+			$processed = $this->jobMapper->findAllProcessed($this->userId);
+			$this->jobService->handleProcessed();
 			
 			// return user specific pending state
-			$pending = $this->jobMapper->findAllPending ( $this->userId );
+			$pending = $this->jobMapper->findAllPending($this->userId);
 			
 			// return user specific failed state and set up error
-			$failed = $this->jobMapper->findAllFailed ( $this->userId );
-			$this->jobService->handleFailed ();
+			$failed = $this->jobMapper->findAllFailed($this->userId);
+			$this->jobService->handleFailed();
 			
 			return [ 
-					'processed' => count ( $processed ),
-					'failed' => count ( $failed ),
-					'pending' => count ( $pending ) 
+					'processed' => count($processed),
+					'failed' => count($failed),
+					'pending' => count($pending) 
 			];
-		} catch ( Exception $e ) {
-			$this->handleException ( $e );
+		} catch (Exception $e) {
+			$this->handleException($e);
 		}
 	}
 	
@@ -112,9 +112,9 @@ 
 	 * @throws NotFoundException
 	 */
 	private function handleException($e) {
-		$this->logger->logException ( $e, [ 
+		$this->logger->logException($e, [ 
 				'message' => 'Exception during status service function processing' 
-		] );
+		]);
 		throw $e;
 	}
 }
\ No newline at end of file