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-08-07 09:50:29 +02:00
parent 869f0878c2
commit e4c3d61b76
4 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Console/Commands/CleanupDatabase.php
View File

@@ -19,6 +19,7 @@ class CleanupDatabase extends Command
echo "Running database cleanup in dry-run mode...\n";
}
if (isCloud()) {
// Later on we can increase this to 180 days or dynamically set
$keep_days = 60;
} else {
$keep_days = 60;

12
app/Console/Kernel.php
View File

@@ -34,24 +34,24 @@ class Kernel extends ConsoleKernel
// Instance Jobs
$schedule->command('horizon:snapshot')->everyMinute();
$schedule->job(new CleanupInstanceStuffsJob)->everyMinute()->onOneServer();
$schedule->job(new PullTemplatesFromCDN)->cron($settings->update_check_frequency)->onOneServer();
// Server Jobs
$this->check_scheduled_backups($schedule);
$this->checkResourcesNew($schedule);
$this->check_resources($schedule);
$this->check_scheduled_tasks($schedule);
$schedule->command('uploads:clear')->everyTwoMinutes();
} else {
// Instance Jobs
$schedule->command('horizon:snapshot')->everyFiveMinutes();
$schedule->command('cleanup:unreachable-servers')->daily();
$this->scheduleUpdates($schedule);
$schedule->job(new PullCoolifyImageJob)->cron($settings->update_check_frequency)->onOneServer();
$schedule->job(new PullTemplatesFromCDN)->cron($settings->update_check_frequency)->onOneServer();
$schedule->job(new CleanupInstanceStuffsJob)->everyTwoMinutes()->onOneServer();
$this->schedule_updates($schedule);
// Server Jobs
$this->check_scheduled_backups($schedule);
$this->checkResourcesNew($schedule);
$this->check_resources($schedule);
$this->pull_images($schedule);
$this->check_scheduled_tasks($schedule);
@@ -72,7 +72,7 @@ class Kernel extends ConsoleKernel
}
}
private function scheduleUpdates($schedule)
private function schedule_updates($schedule)
{
$settings = InstanceSettings::get();
@@ -85,7 +85,7 @@ class Kernel extends ConsoleKernel
}
}
private function checkResourcesNew($schedule)
private function check_resources($schedule)
{
if (isCloud()) {
$servers = $this->all_servers->whereNotNull('team.subscription')->where('team.subscription.stripe_trial_already_ended', false)->where('ip', '!=', '1.2.3.4');