Peter M. Groen / knowledgetree

Commit 6bdf2859f35f565a85b782a8c62baea01a9d839c

Authored by Jarrett Jordaan
1 parent 5e7e9ed3

KTS-4438: Updated Services 

Committed by: Jarrett Jordaan

Reviewed by: Megan Watson
Inline Side-by-side
Showing 4 changed files with 21 additions and 11 deletions
setup/wizard/lib/services/unixLucene.php
  View file @6bdf285
... ... @@ -64,8 +64,8 @@ class unixLucene extends unixService {
64 64 $this->setLuceneDir(SYSTEM_DIR."bin".DS."luceneserver".DS);
65 65 $this->setIndexerDir(SYSTEM_DIR."search2".DS."indexing".DS."bin".DS);
66 66 $this->setLucenePidFile("lucene_test.pid");
67   - $this->setJavaXms(512);
68   - $this->setJavaXmx(512);
  67 + $this->setJavaXms(1024);
  68 + $this->setJavaXmx(1024);
69 69 $this->setLuceneSourceLoc("ktlucene.jar");
70 70 $this->setShutdownScript("shutdown.php");
71 71 }
... ... @@ -201,10 +201,11 @@ class unixLucene extends unixService {
201 201 public function start() {
202 202 $state = $this->status();
203 203 if($state != 'STARTED') {
204   - $logFile = $this->outputDir.DS."lucene.log";
  204 + //$logFile = $this->outputDir."lucene.log";
  205 + $logFile = "/dev/null";//$this->outputDir."lucene.log";
205 206 @unlink($logFile);
206 207 $cmd = "cd ".$this->getLuceneDir()."; ";
207   - $cmd .= "nohup java {$this->getJavaXmx()} {$this->getJavaXmx()} -jar ".$this->getLuceneSource()." > ".$logFile." 2>&1 & echo $!";
  208 + $cmd .= "nohup java ".$this->getLuceneSource()." {$this->getJavaXmx()} {$this->getJavaXms()} -jar > ".$logFile." 2>&1 & echo $!";
208 209 if(DEBUG) {
209 210 echo "Command : $cmd<br/>";
210 211 return false;
... ...
setup/wizard/lib/services/unixScheduler.php
  View file @6bdf285
... ... @@ -180,7 +180,8 @@ class unixScheduler extends unixService {
180 180 // TODO : Write sh on the fly? Not sure the reasoning here
181 181 $source = $this->getSchedulerSourceLoc();
182 182 $this->writeSchedulerTask();
183   - $logFile = $this->outputDir.DS."scheduler.log";
  183 +// $logFile = $this->outputDir."scheduler.log";
  184 + $logFile = "/dev/null";
184 185 @unlink($logFile);
185 186 if($source) { // Source
186 187 $cmd = "nohup ".$source." > ".$logFile." 2>&1 & echo $!";
... ...
setup/wizard/resources/css/wizard.css
  View file @6bdf285
... ... @@ -509,9 +509,9 @@ td.dir_description {
509 509 }
510 510  
511 511 .demo {
512   - left:75px;
  512 + /*left:75px;
513 513 position:relative;
514   - width:600px
  514 + width:600px*/
515 515 }
516 516  
517 517 .text_message {
... ... @@ -543,4 +543,9 @@ td.dir_description {
543 543 position:relative;
544 544 padding-left: 400px;
545 545 padding-top: 10px;
  546 +}
  547 +
  548 +#left_space {
  549 + float:left;
  550 + width:50%;
546 551 }
547 552 \ No newline at end of file
... ...
setup/wizard/templates/install.tpl
  View file @6bdf285
... ... @@ -2,11 +2,14 @@
2 2 <p class="title">Finalizing System Installation</p>
3 3 <div id="step_content_<?php echo $step_name; ?>" class="step">
4 4 <p class="empty_space"> The wizard will now complete the installation and run a final check on your system. </p>
5   - <p class="empty_space">
6   - We would greatly appreciate it if you would allow us to collect anonymous usage statistics to help us provide a better quality product. The information includes a unique identification number, number of users you have created, your operating system type and your IP address. Your privacy is protected by the <a href="http://www.knowledgetree.com/about/legal" target="_blank">KnowledgeTree Privacy and Data Protection Agreements.</a>
  5 + <br/>
  6 + <p class="empty_space" id="left_space">
  7 + We would greatly appreciate it if you would allow us to collect anonymous usage statistics to help us provide a better quality product.
  8 + <br/><br/>
  9 + The information includes a unique identification number, number of users you have created, your operating system type and your IP address. Your privacy is protected by the <a href="http://www.knowledgetree.com/about/legal" target="_blank">KnowledgeTree Privacy and Data Protection Agreements.</a>
7 10 </p>
8   - <div class="demo"><?php echo $html->image('greenit.jpg'); ?></div>
9   - <br/><br/>
  11 + <div class="demo"><?php echo $html->image('greenit.jpg', array('style'=>'padding-left: 35px;')); ?></div>
  12 + <br/><br/><br/><br/>
10 13 <p> <input class="" type='checkbox' name='call_home' value='enable' checked style="float:left;"/>&nbsp;&nbsp;
11 14 Help to improve KnowledgeTree by providing anonymous usage statistics</p>
12 15 </div>
... ...