Add info to know if a request is running from WS

Benjamin Renard
1 parent f0d097e2
Showing 6 changed files with 34 additions and 6 deletions Show diff stats
src/InputOutput/WSImpl/Params/DownloadImpl/WSInputOutputParamsDownloadClass.php
src/InputOutput/WSImpl/Params/PlotImpl/WSInputOutputParamsPlotClass.php
src/Request/ProcessRequestImpl/Process/ProcessClass.php
src/Request/ProcessRequestImpl/Process/ProcessManagerClass.php
src/Request/ProcessRequestImpl/ProcessRequestClass.php
src/Request/ProcessRequestImpl/ProcessRequestDataClass.php
@@ -129,6 +129,8 @@ class WSInputOutputParamsDownloadClass extends IHMInputOutputParamsAbstractClass
  
 		$this->paramsData->setBatchEnable(WSConfigClass::$enableBatch);
  
+		$this->paramsData->setFromWS(true);
+
 		return $this->paramsData;
 	}
  
@@ -110,6 +110,8 @@ class WSInputOutputParamsPlotClass extends IHMInputOutputParamsAbstractClass
  
 		$this->paramsData->setBatchEnable(true);
 		$this->paramsData->setPostCmd($postProcessCmd);
+
+		$this->paramsData->setFromWS(true);
  
 		return $this->paramsData;
 	}
@@ -19,16 +19,18 @@ class ProcessClass
 	private $pID;
 	private $runningPath;
 	private $runningStart;
+	private $fromWS;
  
 	/*
 	 * @brief Constructor
 	*/
-	function __construct($command, $postProcessCmd = "", $getErrorMsgCmd = "")
+	function __construct($command, $postProcessCmd = "", $getErrorMsgCmd = "", $fromWS = FALSE)
 	{
 		$this->command        = $command;
 		$this->postProcessCmd = $postProcessCmd;
 		$this->getErrorMsgCmd = $getErrorMsgCmd;
 		$this->pID            = 0;
+		$this->fromWS         = $fromWS;
 	}
  
 	/*
@@ -187,6 +189,14 @@ class ProcessClass
 	}
  
 	/*
+	 * @brief To know if a process is running from WebService
+	 */
+	public function getFromWS()
+	{
+		return $this->fromWS;
+	}
+
+	/*
 	 * @brief Run the process
 	*/
 	public function run($runningPath, $envArray)
@@ -19,9 +19,9 @@ class ProcessManagerClass
 	/*
 	 * @brief Run a process
 	*/
-	public function runProcess($cmd, $runningPath, $envArray, $postProcessCmd, $getErrorMsgCmd, $batchEnabled)
+	public function runProcess($cmd, $runningPath, $envArray, $postProcessCmd, $getErrorMsgCmd, $batchEnabled, $fromWS = FALSE)
 	{
-		$process = new ProcessClass($cmd, $postProcessCmd, $getErrorMsgCmd);
+		$process = new ProcessClass($cmd, $postProcessCmd, $getErrorMsgCmd, $fromWS);
  
 		if (!$process->run($runningPath, $envArray))
 			return array("success" => false, "message" => "Cannot run the process");
@@ -168,6 +168,7 @@ class ProcessManagerClass
 		$this->updateProcessStatusToNode($dom,$processNode,"runningstart",$process->getRunningStart());
 		$this->updateProcessStatusToNode($dom,$processNode,"isrunning",$process->isRunning() ? "true" : "false");
 		$this->updateProcessStatusToNode($dom,$processNode,"lastupdate",time());
+		$this->updateProcessStatusToNode($dom,$processNode,"fromws", $process->getFromWS() ? "true" : "false");
 	}
  
 	/*
@@ -191,7 +192,8 @@ class ProcessManagerClass
 				"runningstart" => $this->getNodeValueFromNode($processNode, "runningstart"),
 				"isrunning"    => ($this->getNodeValueFromNode($processNode, "isrunning") == "true"),
 				"iskilled"     => ($this->getNodeValueFromNode($processNode, "iskilled") == "true"),
-				"lastupdate"   => $this->getNodeValueFromNode($processNode, "lastupdate")
+				"lastupdate"   => $this->getNodeValueFromNode($processNode, "lastupdate"),
+				"fromws"       => ($this->getNodeValueFromNode($processNode, "fromws") == "true"),
 		);
 	}
  
@@ -127,7 +127,8 @@ class ProcessRequestClass extends RequestAbstractClass
 				$this->requestData->getEnvVars(),
 				$this->requestData->getPostCmd(),
 				$this->requestData->getGetErrorMsgCmd(),
-				$this->requestData->getBatchEnable());
+				$this->requestData->getBatchEnable(),
+				$this->requestData->getFromWS());
 				if ($result['success']) {
 					$return_code = TRUE;
 					$this->updateProcess($result['result'], $processMgr);
@@ -49,7 +49,8 @@ class ProcessRequestDataClass extends RequestDataClass
 	private $errorMsg        = "";
 	private $execTime        = 0;
 	private $start           = 0;
-	private $runningPath = "";
+	private $runningPath     = "";
+	private $fromWS          = false;
  
 	public function getManagerFilePath()
 	{
@@ -200,6 +201,16 @@ class ProcessRequestDataClass extends RequestDataClass
 	{
 		$this->execTime = $execTime;
 	}
+
+	public function getFromWS()
+	{
+		return $this->fromWS;
+	}
+
+	public function setFromWS($fromWS)
+	{
+		$this->fromWS = $fromWS;
+	}
 }
  
 ?>