Refactoring: extract process handling from async job.

This commit is contained in:
Joao Patricio
2023-03-21 10:32:38 +00:00
parent 34c9265aa9
commit 29fb40bd16
6 changed files with 27 additions and 39 deletions

View File

@@ -3,32 +3,16 @@
namespace App\Actions\RemoteProcess;
use App\Data\RemoteProcessArgs;
use App\Enums\ActivityTypes;
use App\Enums\ProcessStatus;
use App\Jobs\ExecuteCoolifyProcess;
use Spatie\Activitylog\Contracts\Activity;
use Spatie\Activitylog\Models\Activity;
class DispatchRemoteProcess
{
protected Activity $activity;
// TODO Left 'root' as default user instead of 'coolify' because
// there's a task at TODO.md to run docker without sudo
public function __construct(
protected string $destination,
protected string $command,
protected ?int $port = 22,
protected ?string $user = 'root',
){
$arguments = new RemoteProcessArgs(
destination: $this->destination,
command: $this->command,
port: $this->port,
user: $this->user,
);
public function __construct(RemoteProcessArgs $remoteProcessArgs){
$this->activity = activity()
->withProperties($arguments->toArray())
->withProperties($remoteProcessArgs->toArray())
->log("Awaiting command to start...\n\n");
}
@@ -42,5 +26,4 @@ class DispatchRemoteProcess
return $this->activity;
}
}

View File

@@ -7,7 +7,7 @@ use App\Enums\ProcessStatus;
use Illuminate\Process\ProcessResult;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Process;
use Spatie\Activitylog\Contracts\Activity;
use Spatie\Activitylog\Models\Activity;
class RunRemoteProcess
{
@@ -73,10 +73,6 @@ class RunRemoteProcess
. '-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null '
. '-o PasswordAuthentication=no '
. '-o RequestTTY=no '
// Quiet mode. Causes most warning and diagnostic messages to be suppressed.
// Errors are still out put. This is to silence for example, that warning
// Permanently added <host and key type> to the list of known hosts.
. '-q '
. "-p {$port} "
. "{$user}@{$destination} "
. " 'bash -se' << \\$delimiter" . PHP_EOL