From d757134ceda9df7abfaac027579113cb77c3ea56 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Tue, 4 Jul 2023 14:29:52 +0200 Subject: [PATCH] fix: debug log button --- .../Project/Application/DeploymentNavbar.php | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/app/Http/Livewire/Project/Application/DeploymentNavbar.php b/app/Http/Livewire/Project/Application/DeploymentNavbar.php index 5daa2f84f..4f2e61851 100644 --- a/app/Http/Livewire/Project/Application/DeploymentNavbar.php +++ b/app/Http/Livewire/Project/Application/DeploymentNavbar.php @@ -5,6 +5,7 @@ namespace App\Http\Livewire\Project\Application; use App\Enums\ApplicationDeploymentStatus; use App\Models\Application; use App\Models\ApplicationDeploymentQueue; +use App\Models\Server; use Illuminate\Support\Carbon; use Illuminate\Support\Facades\Process; use Livewire\Component; @@ -15,29 +16,34 @@ class DeploymentNavbar extends Component protected $listeners = ['deploymentFinished']; public ApplicationDeploymentQueue $application_deployment_queue; + private Application $application; + private Server $server; public bool $is_debug_enabled = false; + public function mount() + { + $this->application = Application::find($this->application_deployment_queue->application_id); + $this->server = $this->application->destination->server; + $this->is_debug_enabled = $this->application->settings->is_debug_enabled; + } public function deploymentFinished() { $this->application_deployment_queue->refresh(); } public function show_debug() { - $application = Application::find($this->application_deployment_queue->application_id); - $application->settings->is_debug_enabled = !$application->settings->is_debug_enabled; - $application->settings->save(); - $this->is_debug_enabled = $application->settings->is_debug_enabled; + $this->application->settings->is_debug_enabled = !$this->application->settings->is_debug_enabled; + $this->application->settings->save(); + $this->is_debug_enabled = $this->application->settings->is_debug_enabled; $this->emit('refreshQueue'); } public function cancel() { try { $kill_command = "kill -9 {$this->application_deployment_queue->current_process_id}"; - $application = Application::find($this->application_deployment_queue->application_id); - $server = $application->destination->server; if ($this->application_deployment_queue->current_process_id) { $process = Process::run("ps -p {$this->application_deployment_queue->current_process_id} -o command --no-headers"); - if (Str::of($process->output())->contains([$server->ip, 'EOF-COOLIFY-SSH'])) { + if (Str::of($process->output())->contains([$this->server->ip, 'EOF-COOLIFY-SSH'])) { Process::run($kill_command); } $previous_logs = json_decode($this->application_deployment_queue->logs, associative: true, flags: JSON_THROW_ON_ERROR);