Shiloh/lasthourcloud
Shiloh/lasthourcloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

fix: server is functional check

Browse Source
This commit is contained in:
Andras Bacsai 2023-09-12 13:14:01 +02:00
parent c76a1b1ba5
commit ab021ee535
7 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Livewire/Server/New/ByIp.php
View File

@ -58,7 +58,7 @@ class ByIp extends Component
{ {
$this->validate(); $this->validate();
try { try {
if (!$this->private_key_id) { if (is_null($this->private_key_id)) {
return $this->emit('error', 'You must select a private key'); return $this->emit('error', 'You must select a private key');
} }
$server = Server::create([ $server = Server::create([

2
app/Http/Livewire/Server/Proxy/Status.php
View File

@ -17,7 +17,7 @@ class Status extends Component
public function getProxyStatus() public function getProxyStatus()
{ {
try { try {
if (data_get($this->server, 'settings.is_usable') && data_get($this->server, 'settings.is_reachable')) { if ($this->server->isFunctional()) {
$container = getContainerStatus(server: $this->server, container_id: 'coolify-proxy'); $container = getContainerStatus(server: $this->server, container_id: 'coolify-proxy');
$this->server->proxy->status = $container; $this->server->proxy->status = $container;
$this->server->save(); $this->server->save();

4
app/Jobs/DockerCleanupJob.php
View File

@ -36,11 +36,11 @@ class DockerCleanupJob implements ShouldQueue
return; return;
} }
try { try {
ray()->showQueries()->color('orange'); // ray()->showQueries()->color('orange');
$servers = Server::all(); $servers = Server::all();
foreach ($servers as $server) { foreach ($servers as $server) {
if ( if (
!$server->settings->is_reachable && !$server->settings->is_usable !$server->isFunctional()
) { ) {
continue; continue;
} }

3
app/Models/Server.php
View File

@ -153,4 +153,7 @@ class Server extends BaseModel
} }
return $shouldRun; return $shouldRun;
} }
public function isFunctional() {
return $this->settings->is_reachable && $this->settings->is_usable;
}
} }

2
resources/views/livewire/destination/show.blade.php
View File

@ -1,5 +1,5 @@
<div> <div>
@if ($server->settings->is_usable) @if ($server->isFunctional())
<div class="flex items-end gap-2"> <div class="flex items-end gap-2">
<h2>Destinations</h2> <h2>Destinations</h2>
<a href="{{ route('destination.new', ['server_id' => $server->id]) }}"> <a href="{{ route('destination.new', ['server_id' => $server->id]) }}">

4
resources/views/livewire/server/form.blade.php
View File

@ -20,7 +20,7 @@
@endif @endif
</div> </div>
@if (!$server->settings->is_reachable || !$server->settings->is_usable) @if (!$server->isFunctional())
You can't use this server until it is validated. You can't use this server until it is validated.
@else @else
Server validated. Server validated.
@ -57,7 +57,7 @@
Install Docker Engine 24.0 Install Docker Engine 24.0
</x-forms.button> </x-forms.button>
@endif @endif
@if ($server->settings->is_usable) @if ($server->isFunctional())
<h3 class="py-4">Settings</h3> <h3 class="py-4">Settings</h3>
<x-forms.input id="cleanup_after_percentage" label="Disk Cleanup threshold (%)" required <x-forms.input id="cleanup_after_percentage" label="Disk Cleanup threshold (%)" required
helper="Disk cleanup job will be executed if disk usage is more than this number." /> helper="Disk cleanup job will be executed if disk usage is more than this number." />

2
resources/views/livewire/server/proxy.blade.php
View File

@ -1,5 +1,5 @@
<div> <div>
@if (data_get($server,'settings.is_usable')) @if ($server->isFunctional())
@if (data_get($server,'proxy.type')) @if (data_get($server,'proxy.type'))
<x-modal submitWireAction="proxyStatusUpdated" modalId="startProxy"> <x-modal submitWireAction="proxyStatusUpdated" modalId="startProxy">
<x-slot:modalBody> <x-slot:modalBody>