Completed
Push — 5-1 ( 3ac911...75bd40 )
by Tomas Norre
16:29
created
domain/process/class.tx_crawler_domain_process_manager.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
  * Manages cralwer processes and can be used to start a new process or multiple processes
27 27
  *
28 28
  */
29
-class tx_crawler_domain_process_manager  {
29
+class tx_crawler_domain_process_manager {
30 30
 	/**
31 31
 	 * @var $timeToLive integer
32 32
 	 */
@@ -65,8 +65,8 @@  discard block
 block discarded – undo
65 65
 	 * the constructor
66 66
 	 */
67 67
 	public function __construct() {
68
-		$this->processRepository	= new tx_crawler_domain_process_repository();
69
-		$this->queueRepository	= new tx_crawler_domain_queue_repository();
68
+		$this->processRepository = new tx_crawler_domain_process_repository();
69
+		$this->queueRepository = new tx_crawler_domain_queue_repository();
70 70
 		$this->crawlerObj = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('tx_crawler_lib');
71 71
 		$this->timeToLive = intval($this->crawlerObj->extensionSettings['processMaxRunTime']);
72 72
 		$this->countInARun = intval($this->crawlerObj->extensionSettings['countInARun']);
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
 	 */
82 82
 	public function multiProcess($timeout) {
83 83
 		if ($this->processLimit <= 1) {
84
-			throw new RuntimeException('To run crawler in multi process mode you have to configure the processLimit > 1.' . PHP_EOL);
84
+			throw new RuntimeException('To run crawler in multi process mode you have to configure the processLimit > 1.'.PHP_EOL);
85 85
 		}
86 86
 
87 87
 		$pendingItemsStart = $this->queueRepository->countAllPendingItems();
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
 			}
100 100
 			if ($currentPendingItems == 0) {
101 101
 				if ($this->verbose) {
102
-					echo 'Finished...' . chr(10);
102
+					echo 'Finished...'.chr(10);
103 103
 				}
104 104
 				break;
105 105
 			}
@@ -111,16 +111,16 @@  discard block
 block discarded – undo
111 111
 			}
112 112
 			sleep(1);
113 113
 			if ($nextTimeOut < time()) {
114
-				$timedOutProcesses = $this->processRepository->findAll('', 'DESC', NULL, 0, 'ttl >' . $nextTimeOut);
114
+				$timedOutProcesses = $this->processRepository->findAll('', 'DESC', NULL, 0, 'ttl >'.$nextTimeOut);
115 115
 				$nextTimeOut = time() + $this->timeToLive;
116 116
 				if ($this->verbose) {
117
-					echo 'Cleanup' . implode(',', $timedOutProcesses->getProcessIds()) . chr(10);
117
+					echo 'Cleanup'.implode(',', $timedOutProcesses->getProcessIds()).chr(10);
118 118
 				}
119 119
 				$this->crawlerObj->CLI_releaseProcesses($timedOutProcesses->getProcessIds(), true);
120 120
 			}
121 121
 		}
122 122
 		if ($currentPendingItems > 0 && $this->verbose) {
123
-			echo 'Stop with timeout' . chr(10);
123
+			echo 'Stop with timeout'.chr(10);
124 124
 		}
125 125
 	}
126 126
 
@@ -138,17 +138,17 @@  discard block
 block discarded – undo
138 138
 	 */
139 139
 	private function startRequiredProcesses() {
140 140
 		$ret = FALSE;
141
-		$currentProcesses= $this->processRepository->countActive();
142
-		$availableProcessesCount = $this->processLimit-$currentProcesses;
141
+		$currentProcesses = $this->processRepository->countActive();
142
+		$availableProcessesCount = $this->processLimit - $currentProcesses;
143 143
 		$requiredProcessesCount = ceil($this->queueRepository->countAllUnassignedPendingItems() / $this->countInARun);
144
-		$startProcessCount = min(array($availableProcessesCount,$requiredProcessesCount));
144
+		$startProcessCount = min(array($availableProcessesCount, $requiredProcessesCount));
145 145
 		if ($startProcessCount <= 0) {
146 146
 			return $ret;
147 147
 		}
148 148
 		if ($startProcessCount && $this->verbose) {
149 149
 			echo 'Start '.$startProcessCount.' new processes (Running:'.$currentProcesses.')';
150 150
 		}
151
-		for($i=0;$i<$startProcessCount;$i++) {
151
+		for ($i = 0; $i < $startProcessCount; $i++) {
152 152
 			usleep(100);
153 153
 			if ($this->startProcess()) {
154 154
 				if ($this->verbose) {
@@ -168,14 +168,14 @@  discard block
 block discarded – undo
168 168
 	 * @throws Exception if no crawlerprocess was started
169 169
 	 */
170 170
 	public function startProcess() {
171
-		$ttl = (time() + $this->timeToLive -1);
171
+		$ttl = (time() + $this->timeToLive - 1);
172 172
 		$current = $this->processRepository->countNotTimeouted($ttl);
173
-		$completePath = '(' .escapeshellcmd($this->getCrawlerCliPath()) . ' &) > /dev/null';
173
+		$completePath = '('.escapeshellcmd($this->getCrawlerCliPath()).' &) > /dev/null';
174 174
 		if (system($completePath) === FALSE) {
175 175
 			throw new Exception('could not start process!');
176 176
 		}
177 177
 		else {
178
-			for ($i=0;$i<10;$i++) {
178
+			for ($i = 0; $i < 10; $i++) {
179 179
 				if ($this->processRepository->countNotTimeouted($ttl) > $current) {
180 180
 					return true;
181 181
 				}
@@ -190,10 +190,10 @@  discard block
 block discarded – undo
190 190
 	 *
191 191
 	 * @return string
192 192
 	 */
193
-	public function getCrawlerCliPath(){
194
-		$phpPath 		= $this->crawlerObj->extensionSettings['phpPath'] . ' ';
195
-		$pathToTypo3 	= rtrim(\TYPO3\CMS\Core\Utility\GeneralUtility::getIndpEnv('TYPO3_DOCUMENT_ROOT'), '/');
196
-		$pathToTypo3 	.= rtrim(\TYPO3\CMS\Core\Utility\GeneralUtility::getIndpEnv('TYPO3_SITE_PATH'), '/');
193
+	public function getCrawlerCliPath() {
194
+		$phpPath 		= $this->crawlerObj->extensionSettings['phpPath'].' ';
195
+		$pathToTypo3 = rtrim(\TYPO3\CMS\Core\Utility\GeneralUtility::getIndpEnv('TYPO3_DOCUMENT_ROOT'), '/');
196
+		$pathToTypo3 .= rtrim(\TYPO3\CMS\Core\Utility\GeneralUtility::getIndpEnv('TYPO3_SITE_PATH'), '/');
197 197
 		$cliPart	 	= '/typo3/cli_dispatch.phpsh crawler';
198 198
 		return $phpPath.$pathToTypo3.$cliPart;
199 199
 	}
Please login to merge, or discard this patch.