rosslh/coolify
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: containerStatusJob

Browse source
This commit is contained in:
Andras Bacsai 2023-09-28 11:33:16 +02:00
parent 4c1067cf36
commit 3a2d17bc05
4 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Console/Kernel.php
View file

@ -40,8 +40,6 @@ protected function schedule(Schedule $schedule): void
private function check_resources($schedule) private function check_resources($schedule)
{ {
$servers = Server::all()->where('settings.is_usable', true)->where('settings.is_reachable', true); $servers = Server::all()->where('settings.is_usable', true)->where('settings.is_reachable', true);
ray($servers);
foreach ($servers as $server) { foreach ($servers as $server) {
$schedule->job(new ContainerStatusJob($server))->everyMinute()->onOneServer(); $schedule->job(new ContainerStatusJob($server))->everyMinute()->onOneServer();
} }

6
app/Http/Livewire/Server/Proxy/Status.php
View file

@ -18,10 +18,8 @@ public function proxyStatusUpdated()
public function getProxyStatus() public function getProxyStatus()
{ {
try { try {
if ($this->server->isFunctional()) { dispatch_sync(new ContainerStatusJob($this->server));
dispatch_sync(new ContainerStatusJob($this->server)); $this->emit('proxyStatusUpdated');
$this->emit('proxyStatusUpdated');
}
} catch (\Throwable $e) { } catch (\Throwable $e) {
return handleError($e, $this); return handleError($e, $this);
} }

3
app/Jobs/ContainerStatusJob.php
View file

@ -28,11 +28,12 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
public function __construct(public Server $server) public function __construct(public Server $server)
{ {
$this->handle();
} }
public function middleware(): array public function middleware(): array
{ {
return [new WithoutOverlapping($this->server->uuid)]; return [(new WithoutOverlapping($this->server->uuid))->dontRelease()];
} }
public function uniqueId(): string public function uniqueId(): string

2
app/Notifications/Internal/GeneralNotification.php
View file

@ -12,7 +12,7 @@ class GeneralNotification extends Notification implements ShouldQueue
{ {
use Queueable; use Queueable;
public $tries = 5; public $tries = 1;
public function __construct(public string $message) public function __construct(public string $message)
{ {
} }