Merge branch 'master' into plot-request

Benjamin Renard
2 parents 20fe3f49 ef39e50d
Showing 4 changed files with 58 additions and 77 deletions Show diff stats
src/InputOutput/IHMImpl/Tools/IHMJobsManagerClass.php
src/InputOutput/WSImpl/Config/WSConfigClass.php
src/InputOutput/WSImpl/Tools/WSJobsManagerClass.php
src/Request/ProcessRequestImpl/Process/ProcessClass.php
@@ -437,7 +437,9 @@ class IHMJobsManagerClass {
 		$res = $this->init();
 		if (!$res['success'])
 			return $res;
-
+			
+		$this->lockService();
+		
 		$job = $this->jobXml->getElementById($id);
  
 		if (!isset($job)) {
@@ -494,7 +496,9 @@ class IHMJobsManagerClass {
 		$job->setAttribute('info', $strInfo);
  
 		$res = $this->jobXml->save($this->jobXmlName);
-
+		
+		$this->unlockService();
+		
 		if (!$res)
 			return array(
 					'success' => false,
@@ -502,7 +506,9 @@ class IHMJobsManagerClass {
  
 		return $this->getJobInfo($id);
 	}
-
+	
+	public function lockService(){}
+	public function unlockService(){}
 	/*
 	 * @brief Get the list of jobs with a specific status
 	*/
@@ -11,16 +11,17 @@ class WSConfigClass
 	const ORBIT         = "getorbites";
 	const DATASET       = "getdataset";
  
-	public static $timeToBatchMode = 300;
+	public static $timeToBatchMode = 240;
 	public static $enableBatch = true;
 	public static $file_prefix = "result_";
-	public static $timeLimitQuery = 1800; // secs
+	public static $timeLimitQuery = 1800; // time limit for the current token in secs
  
 	//TODO define during installation
 	private static $xslDir = "xml/";
  
 	private static $wsResultDir = "WSRESULT";
 	private static $jobsFile = "WSjobs.xml";
+	private static $LockFile = "LOCK";
  
 	private static $WebUrl;
  
@@ -44,6 +45,22 @@ class WSConfigClass
 			return IHMConfigClass::getDataDir().self::$wsResultDir.'/'.self::$jobsFile;
 	}
  
+	public static function lockServices()
+	{
+			touch(IHMConfigClass::getDataDir().self::$wsResultDir.'/'.self::$LockFile);	
+	}
+	
+	public static function isLockedServices()
+	{
+			return file_exists(IHMConfigClass::getDataDir().self::$wsResultDir.'/'.self::$LockFile);	
+	}
+	
+	public static function unlockServices()
+	{
+			if (file_exists(IHMConfigClass::getDataDir().self::$wsResultDir.'/'.self::$LockFile))
+					unlink(IHMConfigClass::getDataDir().self::$wsResultDir.'/'.self::$LockFile);
+	}
+	
 	public static function getDataSetInfoDir()
 	{
 			return IHMConfigClass::getGenericDataPath().self::$dataSetInfoDir.'/';
@@ -41,6 +41,10 @@ class WSJobsManagerClass extends IHMJobsManagerClass {
 				return $res;
 			}
 		}
+
+		while (WSConfigClass::isLockedServices())
+			 sleep(1);
+
 		$res = $this->jobXml->load($this->jobXmlName);
 		if (!$res) {
 			error_log("WebServices Error : Cannot load WSjobs.xml", 1, email);
@@ -48,7 +52,7 @@ class WSJobsManagerClass extends IHMJobsManagerClass {
 					"success" => false,
 					"message" => "Cannot load jobs file");
 			}
-
+			 
 		return array("success" => true);
 	}
  
@@ -105,7 +109,16 @@ class WSJobsManagerClass extends IHMJobsManagerClass {
 				'compression' => $compression
 		);
 	}
-
+	
+	public function lockService(){
+		if (!WSConfigClass::isLockedServices())
+				WSConfigClass::lockServices();
+	}
+	
+	public function unlockService(){ 
+		if (WSConfigClass::isLockedServices())
+			WSConfigClass::unlockServices();
+	}
 	/*
 	 * @brief Add a new job
 	*/
@@ -113,10 +126,12 @@ class WSJobsManagerClass extends IHMJobsManagerClass {
 			$running, $start, $result, $exitcode)
 	{
 		$res = $this->init();
-		
+
 		if (!$res['success'])
 			return $res;
-			
+
+		$this->lockService();
+					 	
 		$key = WSInputOutputClass::getService();
  
 		$newJob = $this->jobXml->createElement('job');
@@ -124,39 +139,11 @@ class WSJobsManagerClass extends IHMJobsManagerClass {
 		$newJob->setAttribute('xml:id', $id);
  		$newJob->setAttribute('jobType', $key);
  
-// 		switch ($key)
-// 		{
-// 			case 'parameter' :
-// 				$name = "download_".time();
-// 				$info = '';
-// 				foreach ($obj->list as $param)
-// 				{
-// 					$info .= ' '.$param->paramid; //data
-// 				}
-// 				break;
-// 			case 'plot'	 :
-// 				$name = "request_".time();
-// 				$info = '';
-// 				for ($i=0; $i < count($obj->children); $i++) {
-// 					for ($j=0; $j < count($obj->children[$i]->children); $j++) {
-// 						$info = $info.' '.$obj->children[$i]->children[$j]->paramid;
-// 					}
-// 				}
-// 				break;
-// 			default:
-// 				$name = "unknown_".time();
-// 				$info = '';
-// 		}
-
-// 		$newJob->setAttribute('name', $name);
-// 		$newJob->setAttribute('info', $info);
 		$newJob->setAttribute('result', $result);
 		$newJob->setAttribute('folder', $folder);
 		$newJob->setAttribute('start', date('d-m-Y H:i:s', $start));
 		$newJob->setAttribute('user', IHMConfigClass::getUserName());
 		$newJob->setAttribute('host', IHMConfigClass::getUserHost());
-		//to know if know if it's an immediate job or not
-// 		$newJob->setAttribute('immediate', !$running);
  
 		if ($running)
 		{
@@ -182,49 +169,20 @@ class WSJobsManagerClass extends IHMJobsManagerClass {
 		}
  
 		$rootJobNode->appendChild($newJob);
-		 
-		if (!$this->jobXml->save($this->jobXmlName))
+		
+		if (!$this->jobXml->save($this->jobXmlName)) {
+			$this->unlockService();
 			return  array("success" => false, "message" => "Cannot save job manager file");
-
+		}
+		$this->unlockService();
 		$this->saveRequestObjectFile($obj, $id);
+		
+		$res = $this->updateJobStatus($id, $running, $exitcode);
  
-		return  $this->updateJobStatus($id, $running, $exitcode);
+		return  $res;
+		
 	}
  
-	/*
-	 * @brief Update the status of a job
-	*/
-// 	public function updateJobStatus($id, $running, $exitcode)
-// 	{
-// 		$res = $this->init();
-// 		if (!$res['success'])
-// 			return $res;
-// 
-// 		$job = $this->jobXml->getElementById($id);
-// 
-// 		if (!isset($job))
-// 			return array("success" => false, "message" => "Cannot found job");
-// 			
-// 		$jobstatus = $this->getJobStatus($running,$exitcode);
-// 		$job->setAttribute('status', $jobstatus);
-// 
-// 		if ($running)
-// 			$job->setAttribute('stop', 'unknown');
-// 		else if ($job->getAttribute('stop') == '' || $job->getAttribute('stop') == 'unknown')
-// 		{
-// 			$job->setAttribute('stop', date('d-m-Y H:i:s', time()));
-// 			$this->jobXml->getElementById($this->resRootNode[$job->getAttribute('jobType')])->appendChild($job);
-// 		}
-// 			
-// 		$res = $this->jobXml->save($this->jobXmlName);
-// 
-// 		if (!$res)
-// 			return array(
-// 					'success' => false,
-// 					'message' => "Cannot save jobs status file");
-// 			
-// 		return $this->getJobInfo($id);
-// 	}
  
 	/*
 	 * @brief delete a job
@@ -220,7 +220,7 @@ class ProcessClass
 		{
 			if (!call_user_func($callback,$this,$batchEnabled))
 				return false;
-			sleep(2);
+			usleep(100000);
 		}
 		return true;
 	}
@@ -246,7 +246,7 @@ class ProcessClass
 		$cmd = "pkill -TERM -P $this->pID";
 		//$cmd = 'kill '.$this->pID;
 		exec($cmd);
-		return !$this->isRunning();
+		return TRUE;
 	}
  
 	/*