fix: deployment queue

fix: cancel deployment ui: changed to simpler toaster
ahort · Jan 25, 2024 · 7a7157c · 7a7157c
1 parent 0c5e860
commit 7a7157c
Show file tree

Hide file tree

Showing 10 changed files with 499 additions and 113 deletions.
diff --git a/app/Jobs/ApplicationDeploymentJob.php b/app/Jobs/ApplicationDeploymentJob.php
@@ -381,7 +381,7 @@ private function generate_image_names()
     }
     private function just_restart()
     {
-        $this->application_deployment_queue->addLogEntry("Starting deployment of {$this->customRepository}:{$this->application->git_branch}.'");
+        $this->application_deployment_queue->addLogEntry("Starting deployment of {$this->customRepository}:{$this->application->git_branch}.");
         $this->prepare_builder_image();
         $this->check_git_if_build_needed();
         $this->set_base_dir();

diff --git a/app/Livewire/Project/Application/DeploymentNavbar.php b/app/Livewire/Project/Application/DeploymentNavbar.php
@@ -41,34 +41,30 @@ public function show_debug()
     public function cancel()
     {
         try {
-            $kill_command = "kill -9 {$this->application_deployment_queue->current_process_id}";
-            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([$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);
-                $new_log_entry = [
-                    'command' => $kill_command,
-                    'output' => "Deployment cancelled by user.",
-                    'type' => 'stderr',
-                    'order' => count($previous_logs) + 1,
-                    'timestamp' => Carbon::now('UTC'),
-                    'hidden' => false,
-                ];
-                $previous_logs[] = $new_log_entry;
-                $this->application_deployment_queue->update([
-                    'logs' => json_encode($previous_logs, flags: JSON_THROW_ON_ERROR),
-                ]);
-            }
+            $kill_command = "docker rm -f {$this->application_deployment_queue->deployment_uuid}";
+            $previous_logs = json_decode($this->application_deployment_queue->logs, associative: true, flags: JSON_THROW_ON_ERROR);
+
+            $new_log_entry = [
+                'command' => $kill_command,
+                'output' => "Deployment cancelled by user.",
+                'type' => 'stderr',
+                'order' => count($previous_logs) + 1,
+                'timestamp' => Carbon::now('UTC'),
+                'hidden' => false,
+            ];
+            $previous_logs[] = $new_log_entry;
+            $this->application_deployment_queue->update([
+                'logs' => json_encode($previous_logs, flags: JSON_THROW_ON_ERROR),
+            ]);
+            instant_remote_process([$kill_command], $this->server);
         } catch (\Throwable $e) {
             return handleError($e, $this);
         } finally {
             $this->application_deployment_queue->update([
                 'current_process_id' => null,
                 'status' => ApplicationDeploymentStatus::CANCELLED_BY_USER->value,
             ]);
-            queue_next_deployment($this->application);
+            // queue_next_deployment($this->application);
         }
     }
 }
diff --git a/app/Livewire/Server/Form.php b/app/Livewire/Server/Form.php
@@ -27,7 +27,7 @@ class Form extends Component
         'server.settings.is_swarm_manager' => 'required|boolean',
         'server.settings.is_swarm_worker' => 'required|boolean',
         'server.settings.is_build_server' => 'required|boolean',
-        'server.settings.concurrent_builds' => 'required|integer',
+        'server.settings.concurrent_builds' => 'required|integer|min:1',
         'wildcard_domain' => 'nullable|url',
     ];
     protected $validationAttributes = [

diff --git a/bootstrap/helpers/applications.php b/bootstrap/helpers/applications.php
@@ -10,6 +10,9 @@
 
 function queue_application_deployment(int $application_id, int $server_id, string $deployment_uuid, int | null $pull_request_id = 0, string $commit = 'HEAD', bool $force_rebuild = false, bool $is_webhook = false, bool $restart_only = false, ?string $git_type = null, bool $is_new_deployment = false)
 {
+    $server = Application::find($application_id)->destination->server;
+    $deployments_per_server = ApplicationDeploymentQueue::where('server_id', $server_id)->where('status', 'queued')->orWhere('status', 'in_progress')->get();
+
     $deployment = ApplicationDeploymentQueue::create([
         'application_id' => $application_id,
         'server_id' => $server_id,
@@ -21,14 +24,12 @@ function queue_application_deployment(int $application_id, int $server_id, strin
         'commit' => $commit,
         'git_type' => $git_type
     ]);
-    $server = Application::find($application_id)->destination->server;
     $deployments = ApplicationDeploymentQueue::where('application_id', $application_id);
 
     $queued_deployments = $deployments->where('status', 'queued')->get()->sortByDesc('created_at');
     $running_deployments = $deployments->where('status', 'in_progress')->get()->sortByDesc('created_at');
 
-    $deployments_per_server = ApplicationDeploymentQueue::where('server_id', $server_id)->where('status', 'queued')->orWhere('status', 'in_progress')->get();
-
+    ray($deployments_per_server->count(), $server->settings->concurrent_builds);
     ray('Q:' . $queued_deployments->count() . 'R:' . $running_deployments->count() . '| Queuing deployment: ' . $deployment_uuid . ' of applicationID: ' . $application_id . ' pull request: ' . $pull_request_id . ' with commit: ' . $commit . ' and is it forced: ' . $force_rebuild);
 
     if ($queued_deployments->count() > 1) {
@@ -58,8 +59,7 @@ function queue_application_deployment(int $application_id, int $server_id, strin
 
 function queue_next_deployment(Application $application, bool $isNew = false)
 {
-    $next_found = ApplicationDeploymentQueue::where('status', 'queued')->get()->sortByDesc('created_at')->first();
-    ray('Next found: ' . $next_found);
+    $next_found = ApplicationDeploymentQueue::where('status', 'queued')->get()->sortBy('created_at')->first();
     if ($next_found) {
         if ($isNew) {
             dispatch(new ApplicationDeploymentNewJob(

diff --git a/composer.json b/composer.json
@@ -24,7 +24,6 @@
         "league/flysystem-sftp-v3": "^3.0",
         "livewire/livewire": "^3.0",
         "lorisleiva/laravel-actions": "^2.7",
-        "masmerise/livewire-toaster": "^2.0",
         "nubs/random-name-generator": "^2.2",
         "phpseclib/phpseclib": "~3.0",
         "poliander/cron": "^3.0",

diff --git a/composer.lock b/composer.lock
diff --git a/resources/js/app.js b/resources/js/app.js
@@ -1,6 +1,5 @@
 import { createApp } from "vue";
 import MagicBar from "./components/MagicBar.vue";
-import '../../vendor/masmerise/livewire-toaster/resources/js';
 import "../../vendor/wire-elements/modal/resources/js/modal";
 
 const app = createApp({});