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

rename to docker cleanup and and feedback implementation

Browse Source
This commit is contained in:
ayntk-ai
2024-08-18 23:16:59 +02:00
parent 5d32bd250b
commit 012c23586d
6 changed files with 33 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/Console/Kernel.php
View File

@@ -29,8 +29,6 @@ class Kernel extends ConsoleKernel
{
$this->all_servers = Server::all();
$settings = InstanceSettings::get();
$mainServer = Server::find(0);
$serverSettings = $mainServer->settings;
if (isDev()) {
// Instance Jobs
@@ -44,10 +42,10 @@ class Kernel extends ConsoleKernel
} else {
// Instance Jobs
$schedule->command('horizon:snapshot')->everyFiveMinutes();
$schedule->command('cleanup:unreachable-servers')->cron($serverSettings->server_cleanup_frequency)->onOneServer();
$schedule->command('cleanup:unreachable-servers')->daily()->onOneServer();
$schedule->job(new PullCoolifyImageJob)->cron($settings->update_check_frequency)->onOneServer();
$schedule->job(new PullTemplatesFromCDN)->cron($settings->update_check_frequency)->onOneServer();
$schedule->job(new CleanupInstanceStuffsJob)->cron($serverSettings->server_cleanup_frequency)->onOneServer();
$schedule->job(new CleanupInstanceStuffsJob)->everyTwoMinutes()->onOneServer();
$this->schedule_updates($schedule);
// Server Jobs
@@ -57,7 +55,7 @@ class Kernel extends ConsoleKernel
$this->check_scheduled_tasks($schedule);
$schedule->command('cleanup:database --yes')->daily();
$schedule->command('uploads:clear')->cron($serverSettings->server_cleanup_frequency)->onOneServer();
$schedule->command('uploads:clear')->everyTwoMinutes();
}
}
@@ -95,9 +93,6 @@ class Kernel extends ConsoleKernel
private function check_resources($schedule)
{
$mainServer = Server::find(0);
$serverSettings = $mainServer->settings;
if (isCloud()) {
$servers = $this->all_servers->whereNotNull('team.subscription')->where('team.subscription.stripe_trial_already_ended', false)->where('ip', '!=', '1.2.3.4');
$own = Team::find(0)->servers;
@@ -107,7 +102,11 @@ class Kernel extends ConsoleKernel
}
foreach ($servers as $server) {
$schedule->job(new ServerCheckJob($server))->everyMinute()->onOneServer();
$schedule->job(new DockerCleanupJob($server))->cron($serverSettings->server_cleanup_frequency)->onOneServer();
//The lines below need to be added as soon as timzone is merged!!
//$serverTimezone = $server->settings->server_timezone;
//$schedule->job(new DockerCleanupJob($server))->cron($server->settings->docker_cleanup_frequency)->timezone($serverTimezone)->onOneServer();
$schedule->job(new DockerCleanupJob($server))->cron($server->settings->docker_cleanup_frequency)->onOneServer();
}
}

4
app/Jobs/DockerCleanupJob.php
View File

@@ -29,7 +29,7 @@ class DockerCleanupJob implements ShouldBeEncrypted, ShouldQueue
if (! $this->server->isFunctional()) {
return;
}
if ($this->server->settings->is_force_cleanup_enabled) {
if ($this->server->settings->force_docker_cleanup) {
Log::info('DockerCleanupJob force cleanup on ' . $this->server->name);
CleanupDocker::run(server: $this->server, force: true);
@@ -60,4 +60,4 @@ class DockerCleanupJob implements ShouldBeEncrypted, ShouldQueue
throw $e;
}
}
}
}

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

@@ -45,9 +45,9 @@ class Form extends Component
'server.settings.metrics_history_days' => 'required|integer|min:1',
'wildcard_domain' => 'nullable|url',
'server.settings.is_server_api_enabled' => 'required|boolean',
'server.settings.force_server_cleanup' => 'required|boolean',
'server.settings.server_cleanup_frequency' => 'required_if:server.settings.force_server_cleanup,true|string',
'server.settings.server_cleanup_threshold' => 'required_if:server.settings.force_server_cleanup,false|integer|min:1|max:100',
'server.settings.force_docker_cleanup' => 'required|boolean',
'server.settings.docker_cleanup_frequency' => 'required_if:server.settings.force_docker_cleanup,true|string',
'server.settings.docker_cleanup_threshold' => 'required_if:server.settings.force_docker_cleanup,false|integer|min:1|max:100',
];
protected $validationAttributes = [
@@ -73,17 +73,17 @@ class Form extends Component
public function mount()
{
$this->wildcard_domain = $this->server->settings->wildcard_domain;
$this->server->settings->server_cleanup_threshold = $this->server->settings->server_cleanup_threshold;
$this->server->settings->server_cleanup_frequency = $this->server->settings->server_cleanup_frequency;
$this->server->settings->docker_cleanup_threshold = $this->server->settings->docker_cleanup_threshold;
$this->server->settings->docker_cleanup_frequency = $this->server->settings->docker_cleanup_frequency;
}
public function updated($field)
{
if ($field === 'server.settings.server_cleanup_frequency') {
$frequency = $this->server->settings->server_cleanup_frequency;
if ($field === 'server.settings.docker_cleanup_frequency') {
$frequency = $this->server->settings->docker_cleanup_frequency;
if (empty($frequency) || !validate_cron_expression($frequency)) {
$this->dispatch('error', 'Invalid Cron / Human expression for Server Cleanup Frequency. Resetting to default 10 minutes.');
$this->server->settings->server_cleanup_frequency = '*/10 * * * *';
$this->dispatch('error', 'Invalid Cron / Human expression for Docker Cleanup Frequency. Resetting to default 10 minutes.');
$this->server->settings->docker_cleanup_frequency = '*/10 * * * *';
}
}
}

8
app/Models/ServerSetting.php
View File

@@ -37,8 +37,8 @@ use OpenApi\Attributes as OA;
'metrics_history_days' => ['type' => 'integer'],
'metrics_refresh_rate_seconds' => ['type' => 'integer'],
'metrics_token' => ['type' => 'string'],
'server_cleanup_frequency' => ['type' => 'string'],
'server_cleanup_threshold' => ['type' => 'integer'],
'docker_cleanup_frequency' => ['type' => 'string'],
'docker_cleanup_threshold' => ['type' => 'integer'],
'server_id' => ['type' => 'integer'],
'wildcard_domain' => ['type' => 'string'],
'created_at' => ['type' => 'string'],
@@ -50,8 +50,8 @@ class ServerSetting extends Model
protected $guarded = [];
protected $casts = [
'force_server_cleanup' => 'boolean',
'server_cleanup_threshold' => 'integer',
'force_docker_cleanup' => 'boolean',
'docker_cleanup_threshold' => 'integer',
];
public function server()