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

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
parent 7fabeec08d a2dac9394a
commit 5c05ea4463
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/Console/Kernel.php
View File

@@ -137,7 +137,12 @@ class Kernel extends ConsoleKernel
} }
$server = $scheduled_backup->server(); $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])) { if (isset(VALID_CRON_STRINGS[$scheduled_backup->frequency])) {
$scheduled_backup->frequency = VALID_CRON_STRINGS[$scheduled_backup->frequency]; $scheduled_backup->frequency = VALID_CRON_STRINGS[$scheduled_backup->frequency];
@@ -179,7 +184,11 @@ class Kernel extends ConsoleKernel
} }
$server = $scheduled_task->server(); $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])) { if (isset(VALID_CRON_STRINGS[$scheduled_task->frequency])) {
$scheduled_task->frequency = VALID_CRON_STRINGS[$scheduled_task->frequency]; $scheduled_task->frequency = VALID_CRON_STRINGS[$scheduled_task->frequency];