From f49b87870cf351f415ad243b0c02a87cd5e811a6 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Sat, 30 Sep 2023 20:26:42 +0200 Subject: [PATCH] fix: backups are now working again --- app/Http/Livewire/Project/Database/CreateScheduledBackup.php | 2 +- app/Jobs/DatabaseBackupJob.php | 3 ++- config/sentry.php | 2 +- config/version.php | 2 +- versions.json | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/Http/Livewire/Project/Database/CreateScheduledBackup.php b/app/Http/Livewire/Project/Database/CreateScheduledBackup.php index 8fcd89a0b..a364938c0 100644 --- a/app/Http/Livewire/Project/Database/CreateScheduledBackup.php +++ b/app/Http/Livewire/Project/Database/CreateScheduledBackup.php @@ -10,7 +10,7 @@ class CreateScheduledBackup extends Component public $database; public $frequency; public bool $enabled = true; - public bool $save_s3 = true; + public bool $save_s3 = false; public $s3_storage_id; public $s3s; diff --git a/app/Jobs/DatabaseBackupJob.php b/app/Jobs/DatabaseBackupJob.php index 740a700eb..1138870b5 100644 --- a/app/Jobs/DatabaseBackupJob.php +++ b/app/Jobs/DatabaseBackupJob.php @@ -61,7 +61,8 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted public function handle(): void { try { - if (data_get($this->database, 'status') !== 'running') { + $status = Str::of(data_get($this->database, 'status')); + if (!$status->startsWith('running')) { ray('database not running'); return; } diff --git a/config/sentry.php b/config/sentry.php index 469ea55d5..f5ec7b6ab 100644 --- a/config/sentry.php +++ b/config/sentry.php @@ -7,7 +7,7 @@ return [ // The release version of your application // Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD')) - 'release' => '4.0.0-beta.51', + 'release' => '4.0.0-beta.52', // When left empty or `null` the Laravel environment will be used 'environment' => config('app.env'), diff --git a/config/version.php b/config/version.php index 9724bda6a..42439e4bb 100644 --- a/config/version.php +++ b/config/version.php @@ -1,3 +1,3 @@