Story Id:1166880 Services Debug Updated

Committed by: Jarrett Jordaan Reviewed by: Megan Watson

Story Id:1166880 Services Debug Updated
Committed by: Jarrett Jordaan Reviewed by: Megan Watson
Jarrett Jordaan
1 parent 329b7c94
Showing 9 changed files with 36 additions and 28 deletions
setup/wizard/installWizard.php
setup/wizard/lib/services/unixLucene.php
setup/wizard/lib/services/unixOpenOffice.php
setup/wizard/lib/services/unixScheduler.php
setup/wizard/lib/services/windowsLucene.php
setup/wizard/lib/services/windowsOpenOffice.php
setup/wizard/lib/services/windowsScheduler.php
setup/wizard/path.php
setup/wizard/steps/services.php
@@ -73,6 +73,15 @@ class InstallWizard {
 	protected $bypass = null;
 	/**
+	* Install bypass flag
+	*
+	* @author KnowledgeTree Team
+	* @access protected
+	* @var mixed
+	*/
+	protected $debugLevel = 0;
+	
+	/**
 	* Reference to installer utility object
 	*
 	* @author KnowledgeTree Team
@@ -132,6 +141,19 @@ class InstallWizard {
 	}
 	/**
+	* Set debug level
+	*
+	* @author KnowledgeTree Team
+	* @access private
+	* @param boolean
+	* @return void
+ 	*/
+	private function setDebugLevel($debug) {
+		define('DEBUG', $debug);
+		$this->debugLevel = $debug;
+	}
+	
+	/**
 	* Set util reference
 	*
 	* @author KnowledgeTree Team
@@ -203,6 +225,11 @@ class InstallWizard {
 		if(isset($_GET['bypass'])) {
 			$this->setBypass($_GET['bypass']);
 		}
+		if(isset($_GET['debug'])) {
+			$this->setDebugLevel($_GET['debug']);
+		} else {
+			$this->setDebugLevel(0);
+		}
 		$this->setIUtil(new InstallUtil());
 	}
@@ -185,7 +185,7 @@ class unixLucene extends unixService {
 	    	$cmd = "cd ".$this->getLuceneDir()."; ";
 	    	$cmd .= "nohup java -jar ".$this->getLuceneSource()." > ".SYS_LOG_DIR."lucene.log 2>&1 & echo $!";
 	    	if(DEBUG) {
-	    		echo "$cmd<br/>";
+	    		echo "Command : $cmd<br/>";
 	    		return ;
 	    	}
 	    	$response = $this->util->pexec($cmd);
@@ -157,7 +157,7 @@ class unixOpenOffice extends unixService {
     	if($state != 'STARTED') {
 			$cmd = "nohup {$this->getBin()} ".$this->getOption()." > ".SYS_LOG_DIR."{$this->getLog()} 2>&1 & echo $!";
 	    	if(DEBUG) {
-	    		echo "$cmd<br/>";
+	    		echo "Command : $cmd<br/>";
 	    		return ;
 	    	}
 	    	$response = $this->util->pexec($cmd);
@@ -161,7 +161,7 @@ class unixScheduler extends unixService {
 			$cmd = "nohup ".$source." > ".SYS_LOG_DIR."scheduler.log 2>&1 & echo $!";
 		}
     	if(DEBUG) {
-    		echo "$cmd<br/>";
+    		echo "Command : $cmd<br/>";
     		return ;
     	}
     	$response = $this->util->pexec($cmd);
@@ -410,7 +410,7 @@ class windowsLucene extends windowsService {
 			if($luceneExe && $luceneSource && $luceneDir) {
 				$cmd = "\"{$luceneExe}\""." -install \"".$this->getName()."\" \"".$this->getJavaJVM(). "\" -Djava.class.path=\"".$luceneSource."\"". " -start ".$this->getLuceneServer(). " -out \"".$this->getLuceneOut()."\" -err \"".$this->getLuceneError()."\" -current \"".$luceneDir."\" -auto";
             	if(DEBUG) {
-            		echo "$cmd<br/>";
+            		echo "Command : $cmd<br/>";
             		return ;
             	}
 				$response = $this->util->pexec($cmd);
@@ -211,7 +211,7 @@ class windowsOpenOffice extends windowsService {
     		$this->setOption();
             $cmd = "\"{$this->winservice}\" install $this->name {$this->getOption()}";
         	if(DEBUG) {
-        		echo "$cmd<br/>";
+        		echo "Command : $cmd<br/>";
         		return ;
         	}
             $response = $this->util->pexec($cmd);
@@ -222,7 +222,7 @@ class windowsScheduler extends windowsService {
             	$this->setOptions();
             	$cmd = "\"{$this->winservice}\" install $this->name $this->options";
             	if(DEBUG) {
-            		echo "$cmd<br/>";
+            		echo "Command : $cmd<br/>";
             		return ;
             	}
             	$response = $this->util->pexec($cmd);
@@ -257,26 +257,5 @@ class windowsScheduler extends windowsService {
 			echo 'Could not write task runner<br>';
 		}
 	}
-	
-	/*
-	private function writeSchedulerTask() {
-		// Check if bin is readable and writable
-		if(is_readable(SYS_OUT_DIR."bin") && is_writable(SYS_OUT_DIR."bin")) {
-			if(!$this->getSchedulerScriptPath()) {
-				if(DEBUG) {
-					echo "Create {$this->getSchedulerScriptPath()} <br/>";
-				}
-				$fp = fopen($this->getSchedulerScriptPath(), "w+");
-				$content = "@echo off\n";
-				$content .= "\"".PHP_DIR."php.exe\" "."\"{$this->getSchedulerSource()}\"";
-				fwrite($fp, $content);
-				fclose($fp);
-			}
-		} else {
-			// TODO: Should not reach this point
-			echo 'Could not write scheduler task<br>';
-		}
-	}
-	*/
 }
 ?>
 \ No newline at end of file
@@ -40,7 +40,6 @@
 * @version Version 0.1
 */
 	// Define installer environment
-	define('DEBUG', 0);
 	define('AJAX', 0);
 	if (substr(php_uname(), 0, 7) == "Windows"){
     	define('WINDOWS_OS', true);
@@ -1222,6 +1222,9 @@ class services extends Step
 if(isset($_GET['action'])) {
 	$func = $_GET['action'];
+	if(isset($_GET['debug'])) {
+		define('DEBUG', $_GET['debug']);
+	}
 	if($func != '') {
 		$serv = new services();
 		$func_call = strtoupper(substr($func,0,1)).substr($func,1);