dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'patricio-wip-11' into patricio-wip-11-merger

Browse Source 
# Conflicts:
#	app/Http/Livewire/DeployApplication.php
#	app/Jobs/ContainerStatusJob.php
#	bootstrap/helpers.php
This commit is contained in:
Joao Patricio
2023-05-03 06:29:05 +01:00
parent f723b504a1 e7763f3b73
commit 85af1b4ffb
16 changed files with 75 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/Actions/RemoteProcess/DispatchRemoteProcess.php → app/Actions/CoolifyTask/PrepareCoolifyTask.php
View File

@@ -1,16 +1,16 @@
<?php
namespace App\Actions\RemoteProcess;
namespace App\Actions\CoolifyTask;
use App\Data\RemoteProcessArgs;
use App\Jobs\ExecuteRemoteProcess;
use App\Data\CoolifyTaskArgs;
use App\Jobs\HandleCoolifyTaskInQueue;
use Spatie\Activitylog\Models\Activity;
class DispatchRemoteProcess
class PrepareCoolifyTask
{
protected Activity $activity;
public function __construct(RemoteProcessArgs $remoteProcessArgs)
public function __construct(CoolifyTaskArgs $remoteProcessArgs)
{
if ($remoteProcessArgs->model) {
$properties = $remoteProcessArgs->toArray();
@@ -31,7 +31,7 @@ class DispatchRemoteProcess
public function __invoke(): Activity
{
$job = new ExecuteRemoteProcess($this->activity);
$job = new HandleCoolifyTaskInQueue($this->activity);
dispatch($job);
$this->activity->refresh();
return $this->activity;

2
app/Actions/RemoteProcess/RunRemoteProcess.php → app/Actions/CoolifyTask/RunRemoteProcess.php
View File

@@ -1,6 +1,6 @@
<?php
namespace App\Actions\RemoteProcess;
namespace App\Actions\CoolifyTask;
use App\Enums\ActivityTypes;
use App\Enums\ProcessStatus;