Clarify some naming. Cleanup.

This commit is contained in:
Joao Patricio
2023-03-21 07:07:38 +00:00
parent 97cd5ed537
commit 6524fade3e
2 changed files with 7 additions and 270 deletions

View File

@@ -41,7 +41,7 @@ class ExecuteCoolifyProcess implements ShouldQueue
/**
* Execute the job.
*/
public function handle(): ?ProcessResult
public function handle(): ProcessResult
{
$this->timeStart = hrtime(true);
@@ -68,27 +68,23 @@ class ExecuteCoolifyProcess implements ShouldQueue
$process = Process::start($sshCommand, $this->handleOutput(...));
$res = $process->wait();
$processResult = $process->wait();
if (app()->environment('testing')) {
return $res;
}
$status = match ($res->exitCode()) {
$status = match ($processResult->exitCode()) {
0 => ProcessStatus::FINISHED,
default => ProcessStatus::ERROR,
};
$this->activity->properties = $this->activity->properties->merge([
'exitCode' => $res->exitCode(),
'stdout' => $res->output(),
'stderr' => $res->errorOutput(),
'exitCode' => $processResult->exitCode(),
'stdout' => $processResult->output(),
'stderr' => $processResult->errorOutput(),
'status' => $status,
]);
$this->activity->save();
return $res;
return $processResult;
}
protected function handleOutput(string $type, string $output)