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

Merge pull request #3347 from coollabsio/next

Browse source 
refactor: Improve handling of server timezones in scheduled backups
This commit is contained in:
Andras Bacsai 2024-09-06 16:42:54 +02:00 committed by GitHub
commit 5c05ea4463
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/Console/Kernel.php
View file

@ -137,7 +137,12 @@ private function check_scheduled_backups($schedule)
}
$server = $scheduled_backup->server();
$serverTimezone = $server->settings->server_timezone;
if (! $server) {
$serverTimezone = config('app.timezone');
} else {
$serverTimezone = $server->settings->server_timezone;
}
if (isset(VALID_CRON_STRINGS[$scheduled_backup->frequency])) {
$scheduled_backup->frequency = VALID_CRON_STRINGS[$scheduled_backup->frequency];
@ -179,7 +184,11 @@ private function check_scheduled_tasks($schedule)
}
$server = $scheduled_task->server();
$serverTimezone = $server->settings->server_timezone ?: config('app.timezone');
if (! $server) {
$serverTimezone = config('app.timezone');
} else {
$serverTimezone = $server->settings->server_timezone ?: config('app.timezone');
}
if (isset(VALID_CRON_STRINGS[$scheduled_task->frequency])) {
$scheduled_task->frequency = VALID_CRON_STRINGS[$scheduled_task->frequency];