From adb070f178dfed06639d6dd071034a8b51b057f6 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 21 May 2023 07:34:27 -0600 Subject: [PATCH] Update scheduler, fix S3 media garbage collection not being executed when cloud storage is enabled via dashboard without .env/config being enabled --- app/Console/Commands/MediaS3GarbageCollector.php | 2 +- app/Console/Kernel.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Console/Commands/MediaS3GarbageCollector.php b/app/Console/Commands/MediaS3GarbageCollector.php index 7cbadc5f3..b6cda43c3 100644 --- a/app/Console/Commands/MediaS3GarbageCollector.php +++ b/app/Console/Commands/MediaS3GarbageCollector.php @@ -45,7 +45,7 @@ class MediaS3GarbageCollector extends Command */ public function handle() { - $enabled = config('pixelfed.cloud_storage'); + $enabled = in_array(config_cache('pixelfed.cloud_storage'), ['1', true, 'true']); if(!$enabled) { $this->error('Cloud storage not enabled. Exiting...'); return; diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index f0a955f8d..11f6d17eb 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -33,7 +33,7 @@ class Kernel extends ConsoleKernel $schedule->command('gc:passwordreset')->dailyAt('09:41'); $schedule->command('gc:sessions')->twiceDaily(13, 23); - if(config('pixelfed.cloud_storage') && config('media.delete_local_after_cloud')) { + if(in_array(config_cache('pixelfed.cloud_storage'), ['1', true, 'true']) && config('media.delete_local_after_cloud')) { $schedule->command('media:s3gc')->hourlyAt(15); } }