From 74e8a4a70368979c4647beb82fb4f106b3a4f269 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 6 Aug 2024 10:52:47 +0200
Subject: [PATCH] refactor: Simplify log drain installation and stop log drain
 if necessary

---
 app/Actions/Server/InstallLogDrain.php |  7 +------
 app/Actions/Server/StopLogDrain.php    | 20 ++++++++++++++++++++
 app/Livewire/Server/LogDrains.php      |  4 ++++
 3 files changed, 25 insertions(+), 6 deletions(-)
 create mode 100644 app/Actions/Server/StopLogDrain.php

diff --git a/app/Actions/Server/InstallLogDrain.php b/app/Actions/Server/InstallLogDrain.php
index 6f74e020b..034d89fe7 100644
--- a/app/Actions/Server/InstallLogDrain.php
+++ b/app/Actions/Server/InstallLogDrain.php
@@ -24,12 +24,7 @@ class InstallLogDrain
         }
         try {
             if ($type === 'none') {
-                $command = [
-                    "echo 'Stopping old Fluent Bit'",
-                    'docker rm -f coolify-log-drain || true',
-                ];
-
-                return instant_remote_process($command, $server);
+                return 'No log drain is enabled.';
             } elseif ($type === 'newrelic') {
                 if (! $server->settings->is_logdrain_newrelic_enabled) {
                     throw new \Exception('New Relic log drain is not enabled.');
diff --git a/app/Actions/Server/StopLogDrain.php b/app/Actions/Server/StopLogDrain.php
new file mode 100644
index 000000000..a5bce94a5
--- /dev/null
+++ b/app/Actions/Server/StopLogDrain.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Actions\Server;
+
+use App\Models\Server;
+use Lorisleiva\Actions\Concerns\AsAction;
+
+class StopLogDrain
+{
+    use AsAction;
+
+    public function handle(Server $server)
+    {
+        try {
+            return instant_remote_process(['docker rm -f coolify-log-drain || true'], $server);
+        } catch (\Throwable $e) {
+            return handleError($e);
+        }
+    }
+}
diff --git a/app/Livewire/Server/LogDrains.php b/app/Livewire/Server/LogDrains.php
index 3d7b34de1..6e09eecdd 100644
--- a/app/Livewire/Server/LogDrains.php
+++ b/app/Livewire/Server/LogDrains.php
@@ -3,6 +3,7 @@
 namespace App\Livewire\Server;
 
 use App\Actions\Server\InstallLogDrain;
+use App\Actions\Server\StopLogDrain;
 use App\Models\Server;
 use Livewire\Component;
 
@@ -132,6 +133,9 @@ class LogDrains extends Component
                     'is_logdrain_axiom_enabled' => false,
                 ]);
             }
+            if (! $this->server->isLogDrainEnabled()) {
+                StopLogDrain::dispatch($this->server);
+            }
             $this->server->settings->save();
             $this->dispatch('success', 'Settings saved.');