Commit f1ae6e2a78eac87f85ce18161f121509d755b533

Authored by Jarrett Jordaan
1 parent b14a2b27

KTS-4439: Office Detection Updated

Committed by: Jarrett Jordaan

Reviewed by: Prince Mbekwa
setup/wizard/lib/services/unixLucene.php
@@ -201,7 +201,7 @@ class unixLucene extends unixService { @@ -201,7 +201,7 @@ class unixLucene extends unixService {
201 public function start() { 201 public function start() {
202 $state = $this->status(); 202 $state = $this->status();
203 if($state != 'STARTED') { 203 if($state != 'STARTED') {
204 - $logFile = $this->outputDir."log".DS."lucene.log"; 204 + $logFile = $this->outputDir.DS."lucene.log";
205 @unlink($logFile); 205 @unlink($logFile);
206 $cmd = "cd ".$this->getLuceneDir()."; "; 206 $cmd = "cd ".$this->getLuceneDir()."; ";
207 $cmd .= "nohup java {$this->getJavaXmx()} {$this->getJavaXmx()} -jar ".$this->getLuceneSource()." > ".$logFile." 2>&1 & echo $!"; 207 $cmd .= "nohup java {$this->getJavaXmx()} {$this->getJavaXmx()} -jar ".$this->getLuceneSource()." > ".$logFile." 2>&1 & echo $!";
setup/wizard/lib/services/unixScheduler.php
@@ -180,7 +180,7 @@ class unixScheduler extends unixService { @@ -180,7 +180,7 @@ class unixScheduler extends unixService {
180 // TODO : Write sh on the fly? Not sure the reasoning here 180 // TODO : Write sh on the fly? Not sure the reasoning here
181 $source = $this->getSchedulerSourceLoc(); 181 $source = $this->getSchedulerSourceLoc();
182 $this->writeSchedulerTask(); 182 $this->writeSchedulerTask();
183 - $logFile = $this->outputDir."log".DS."scheduler.log"; 183 + $logFile = $this->outputDir.DS."scheduler.log";
184 @unlink($logFile); 184 @unlink($logFile);
185 if($source) { // Source 185 if($source) { // Source
186 $cmd = "nohup ".$source." > ".$logFile." 2>&1 & echo $!"; 186 $cmd = "nohup ".$source." > ".$logFile." 2>&1 & echo $!";