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

fix: queries in kernel.php

Browse Source
This commit is contained in:
Andras Bacsai
2024-11-03 14:18:43 +01:00
parent 52b4e6216c
commit 9ff73d62e1
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/Console/Kernel.php
View File

@@ -33,7 +33,7 @@ class Kernel extends ConsoleKernel
protected function schedule(Schedule $schedule): void protected function schedule(Schedule $schedule): void
{ {
$this->allServers = Server::where('ip', '!=', '1.2.3.4')->get(); $this->allServers = Server::where('ip', '!=', '1.2.3.4');
$this->settings = instanceSettings(); $this->settings = instanceSettings();
@@ -76,7 +76,7 @@ class Kernel extends ConsoleKernel
private function pullImages($schedule): void private function pullImages($schedule): void
{ {
$servers = $this->allServers->whereRelation('settings', 'is_usable', true)->whereRelation('settings', 'is_reachable', true); $servers = $this->allServers->whereRelation('settings', 'is_usable', true)->whereRelation('settings', 'is_reachable', true)->get();
foreach ($servers as $server) { foreach ($servers as $server) {
if ($server->isSentinelEnabled()) { if ($server->isSentinelEnabled()) {
$schedule->job(function () use ($server) { $schedule->job(function () use ($server) {
@@ -110,11 +110,11 @@ class Kernel extends ConsoleKernel
private function checkResources($schedule): void private function checkResources($schedule): void
{ {
if (isCloud()) { if (isCloud()) {
$servers = $this->allServers->whereNotNull('team.subscription')->where('team.subscription.stripe_trial_already_ended', false); $servers = $this->allServers->whereHas('team.subscription')->get();
$own = Team::find(0)->servers; $own = Team::find(0)->servers;
$servers = $servers->merge($own); $servers = $servers->merge($own);
} else { } else {
$servers = $this->allServers; $servers = $this->allServers->get();
} }
// $schedule->job(new ResourcesCheck)->everyMinute()->onOneServer(); // $schedule->job(new ResourcesCheck)->everyMinute()->onOneServer();
@@ -150,14 +150,11 @@ class Kernel extends ConsoleKernel
private function checkScheduledBackups($schedule): void private function checkScheduledBackups($schedule): void
{ {
$scheduled_backups = ScheduledDatabaseBackup::all(); $scheduled_backups = ScheduledDatabaseBackup::where('enabled', true)->get();
if ($scheduled_backups->isEmpty()) { if ($scheduled_backups->isEmpty()) {
return; return;
} }
foreach ($scheduled_backups as $scheduled_backup) { foreach ($scheduled_backups as $scheduled_backup) {
if (! $scheduled_backup->enabled) {
continue;
}
if (is_null(data_get($scheduled_backup, 'database'))) { if (is_null(data_get($scheduled_backup, 'database'))) {
$scheduled_backup->delete(); $scheduled_backup->delete();
@@ -166,7 +163,7 @@ class Kernel extends ConsoleKernel
$server = $scheduled_backup->server(); $server = $scheduled_backup->server();
if (! $server) { if (is_null($server)) {
continue; continue;
} }
$serverTimezone = $server->settings->server_timezone; $serverTimezone = $server->settings->server_timezone;