diff --git a/src/InputOutput/IHMImpl/Process/IHMInputOutputGetInfoProcessClass.php b/src/InputOutput/IHMImpl/Process/IHMInputOutputGetInfoProcessClass.php index d6a09c2..3db345e 100644 --- a/src/InputOutput/IHMImpl/Process/IHMInputOutputGetInfoProcessClass.php +++ b/src/InputOutput/IHMImpl/Process/IHMInputOutputGetInfoProcessClass.php @@ -41,13 +41,6 @@ class IHMInputOutputGetInfoProcessClass implements InputOutputInterface */ public function getOutput($data) { - if (!$data->getSuccess()) - { - return array( - 'success' => false, - 'message' => $data->getLastErrorMessage()); - } - return $this->jobsManager->getJobInfo($this->paramsData->getId()); } } diff --git a/src/Request/ProcessRequestImpl/ProcessRequestClass.php b/src/Request/ProcessRequestImpl/ProcessRequestClass.php index 213d0b1..a8882a4 100644 --- a/src/Request/ProcessRequestImpl/ProcessRequestClass.php +++ b/src/Request/ProcessRequestImpl/ProcessRequestClass.php @@ -110,7 +110,8 @@ class ProcessRequestClass extends RequestAbstractClass //create the process manager $processMgr = new ProcessManagerClass($this->requestData->getManagerFilePath()); - + + $return_code = FALSE; switch ($this->requestData->getType()) { case ProcessTypeEnumClass::RUN : @@ -121,25 +122,32 @@ class ProcessRequestClass extends RequestAbstractClass $this->requestData->getEnvVars(), $this->requestData->getPostCmd(), $this->requestData->getBatchEnable()); - if ($result['success']) + if ($result['success']) { + $return_code = TRUE; $this->updateProcess($result['result'], $processMgr); + } break; case ProcessTypeEnumClass::DELETE : //delete process $result = $processMgr->deleteProcess($this->requestData->getId()); - if ($result['success']) + if ($result['success']) { + $return_code = TRUE; $result = $result['result']; + } break; case ProcessTypeEnumClass::INFO : //get process info $result = $processMgr->getProcessInfo($this->requestData->getId(),true); if ($result['success']) $this->updateProcess($result['result'], $processMgr); + $return_code = TRUE; //Return TRUE even if the process cannot be retrieved break; case ProcessTypeEnumClass::KILL : $result = $processMgr->killProcess($this->requestData->getId()); - if ($result['success']) + if ($result['success']) { + $return_code = TRUE; $result = $result['result']; + } break; default : $this->requestData->setLastErrorMessage("Process method not implemented"); @@ -151,7 +159,7 @@ class ProcessRequestClass extends RequestAbstractClass if (!$result['success']) $this->requestData->setLastErrorMessage($result['message']); - return ($result['success']); + return $return_code; } } ?> -- libgit2 0.21.2