From 47be74321cf98c165e74b9a18d2cbbae6e44b435 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 25 Nov 2021 08:04:25 +1100 Subject: [PATCH] Fixes for invoking Public filesystem driver unnecessarily --- app/Console/Commands/S3Cleanup.php | 5 +++++ app/Jobs/Util/DiskCleanup.php | 3 --- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/Console/Commands/S3Cleanup.php b/app/Console/Commands/S3Cleanup.php index d20362c8f303..cb5426a729f6 100644 --- a/app/Console/Commands/S3Cleanup.php +++ b/app/Console/Commands/S3Cleanup.php @@ -3,6 +3,7 @@ namespace App\Console\Commands; use App\Models\Company; +use App\Utils\Ninja; use Illuminate\Console\Command; use Illuminate\Support\Facades\Storage; @@ -42,6 +43,10 @@ class S3Cleanup extends Command public function handle() { + + if(!Ninja::isHosted()) + return; + $c1 = Company::on('db-ninja-01')->pluck('company_key'); $c2 = Company::on('db-ninja-02')->pluck('company_key'); diff --git a/app/Jobs/Util/DiskCleanup.php b/app/Jobs/Util/DiskCleanup.php index 2f44c13b806c..b624bd4531c1 100644 --- a/app/Jobs/Util/DiskCleanup.php +++ b/app/Jobs/Util/DiskCleanup.php @@ -42,8 +42,5 @@ class DiskCleanup implements ShouldQueue $files = Storage::allFiles(config('filesystems.default'), 'backups/'); Storage::delete($files); - $files = Storage::allFiles('public', 'backups/'); - Storage::delete($files); - } }