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

Merge pull request #3348 from coollabsio/next

Browse source 
fix fix fix friday fix
This commit is contained in:
Andras Bacsai 2024-09-06 16:55:54 +02:00 committed by GitHub
commit 254611dda8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/Console/Kernel.php
View file

@ -139,10 +139,9 @@ private function check_scheduled_backups($schedule)
$server = $scheduled_backup->server(); $server = $scheduled_backup->server();
if (! $server) { if (! $server) {
$serverTimezone = config('app.timezone'); continue;
} else {
$serverTimezone = $server->settings->server_timezone;
} }
$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];
@ -185,10 +184,9 @@ private function check_scheduled_tasks($schedule)
$server = $scheduled_task->server(); $server = $scheduled_task->server();
if (! $server) { if (! $server) {
$serverTimezone = config('app.timezone'); continue;
} else {
$serverTimezone = $server->settings->server_timezone ?: config('app.timezone');
} }
$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];