diff --git a/app/Jobs/DockerCleanupJob.php b/app/Jobs/DockerCleanupJob.php index e326dc671..900bae99c 100644 --- a/app/Jobs/DockerCleanupJob.php +++ b/app/Jobs/DockerCleanupJob.php @@ -33,8 +33,9 @@ class DockerCleanupJob implements ShouldBeEncrypted, ShouldQueue } if ($this->manualCleanup || $this->server->settings->force_docker_cleanup) { - Log::info('DockerCleanupJob ' . ($this->manualCleanup ? 'manual' : 'force') . ' cleanup on ' . $this->server->name); + Log::info('DockerCleanupJob '.($this->manualCleanup ? 'manual' : 'force').' cleanup on '.$this->server->name); CleanupDocker::run(server: $this->server); + return; } diff --git a/app/Jobs/ServerLimitCheckJob.php b/app/Jobs/ServerLimitCheckJob.php index b2c816f5d..1f09d5a3b 100644 --- a/app/Jobs/ServerLimitCheckJob.php +++ b/app/Jobs/ServerLimitCheckJob.php @@ -10,7 +10,6 @@ use Illuminate\Contracts\Queue\ShouldBeEncrypted; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; use Illuminate\Queue\InteractsWithQueue; -use Illuminate\Queue\Middleware\; use Illuminate\Queue\SerializesModels; class ServerLimitCheckJob implements ShouldBeEncrypted, ShouldQueue diff --git a/app/Livewire/Server/Form.php b/app/Livewire/Server/Form.php index 38a5725b0..c4f25c79d 100644 --- a/app/Livewire/Server/Form.php +++ b/app/Livewire/Server/Form.php @@ -4,10 +4,10 @@ namespace App\Livewire\Server; use App\Actions\Server\StartSentinel; use App\Actions\Server\StopSentinel; +use App\Jobs\DockerCleanupJob; use App\Jobs\PullSentinelImageJob; use App\Models\Server; use Livewire\Component; -use App\Jobs\DockerCleanupJob; class Form extends Component { @@ -26,6 +26,7 @@ class Form extends Component public $timezones; public $delete_unused_volumes = false; + public $delete_unused_networks = false; public function getListeners() @@ -147,7 +148,7 @@ class Form extends Component try { refresh_server_connection($this->server->privateKey); $this->validateServer(false); - + $this->server->settings->save(); $this->server->save(); $this->dispatch('success', 'Server updated.'); @@ -248,7 +249,7 @@ class Form extends Component } $this->server->settings->save(); $this->server->save(); - + $this->dispatch('success', 'Server updated.'); } catch (\Throwable $e) { return handleError($e, $this); @@ -271,6 +272,7 @@ class Form extends Component return handleError($e, $this); } } + public function manualCloudflareConfig() { $this->server->settings->is_cloudflare_tunnel = true;