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

fixes

Browse Source
This commit is contained in:
Andras Bacsai
2024-09-27 16:43:07 +02:00
parent 6726964f18
commit 65356e9bae
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Jobs/DockerCleanupJob.php
View File

@@ -33,8 +33,9 @@ class DockerCleanupJob implements ShouldBeEncrypted, ShouldQueue
} }
if ($this->manualCleanup || $this->server->settings->force_docker_cleanup) { 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); CleanupDocker::run(server: $this->server);
return; return;
} }

1
app/Jobs/ServerLimitCheckJob.php
View File

@@ -10,7 +10,6 @@ use Illuminate\Contracts\Queue\ShouldBeEncrypted;
use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Bus\Dispatchable; use Illuminate\Foundation\Bus\Dispatchable;
use Illuminate\Queue\InteractsWithQueue; use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Queue\Middleware\;
use Illuminate\Queue\SerializesModels; use Illuminate\Queue\SerializesModels;
class ServerLimitCheckJob implements ShouldBeEncrypted, ShouldQueue class ServerLimitCheckJob implements ShouldBeEncrypted, ShouldQueue

8
app/Livewire/Server/Form.php
View File

@@ -4,10 +4,10 @@ namespace App\Livewire\Server;
use App\Actions\Server\StartSentinel; use App\Actions\Server\StartSentinel;
use App\Actions\Server\StopSentinel; use App\Actions\Server\StopSentinel;
use App\Jobs\DockerCleanupJob;
use App\Jobs\PullSentinelImageJob; use App\Jobs\PullSentinelImageJob;
use App\Models\Server; use App\Models\Server;
use Livewire\Component; use Livewire\Component;
use App\Jobs\DockerCleanupJob;
class Form extends Component class Form extends Component
{ {
@@ -26,6 +26,7 @@ class Form extends Component
public $timezones; public $timezones;
public $delete_unused_volumes = false; public $delete_unused_volumes = false;
public $delete_unused_networks = false; public $delete_unused_networks = false;
public function getListeners() public function getListeners()
@@ -147,7 +148,7 @@ class Form extends Component
try { try {
refresh_server_connection($this->server->privateKey); refresh_server_connection($this->server->privateKey);
$this->validateServer(false); $this->validateServer(false);
$this->server->settings->save(); $this->server->settings->save();
$this->server->save(); $this->server->save();
$this->dispatch('success', 'Server updated.'); $this->dispatch('success', 'Server updated.');
@@ -248,7 +249,7 @@ class Form extends Component
} }
$this->server->settings->save(); $this->server->settings->save();
$this->server->save(); $this->server->save();
$this->dispatch('success', 'Server updated.'); $this->dispatch('success', 'Server updated.');
} catch (\Throwable $e) { } catch (\Throwable $e) {
return handleError($e, $this); return handleError($e, $this);
@@ -271,6 +272,7 @@ class Form extends Component
return handleError($e, $this); return handleError($e, $this);
} }
} }
public function manualCloudflareConfig() public function manualCloudflareConfig()
{ {
$this->server->settings->is_cloudflare_tunnel = true; $this->server->settings->is_cloudflare_tunnel = true;