From bbcf484f7f48beacb7002a22f0c73f4e1eb4b1b6 Mon Sep 17 00:00:00 2001 From: iamEvan Date: Sat, 27 Apr 2024 11:22:58 +0100 Subject: [PATCH 1/3] Fix MongoDB Backups failing! --- app/Models/StandaloneMongodb.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Models/StandaloneMongodb.php b/app/Models/StandaloneMongodb.php index 5538efe1a..63a6f94dc 100644 --- a/app/Models/StandaloneMongodb.php +++ b/app/Models/StandaloneMongodb.php @@ -224,6 +224,6 @@ class StandaloneMongodb extends BaseModel return $this->morphMany(ScheduledDatabaseBackup::class, 'database'); } public function database_name() { - return $this->mongo_db; + return "???"; } } From 3976b57100d598e043c89cb1ef4e4b5c41586b91 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Sun, 28 Apr 2024 11:17:20 +0200 Subject: [PATCH 2/3] fix: mongo db backup --- app/Notifications/Database/BackupFailed.php | 2 +- app/Notifications/Database/BackupSuccess.php | 2 +- config/sentry.php | 2 +- config/version.php | 2 +- resources/views/emails/backup-failed.blade.php | 2 +- resources/views/emails/backup-success.blade.php | 2 +- versions.json | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/Notifications/Database/BackupFailed.php b/app/Notifications/Database/BackupFailed.php index 3aa63ffd9..67fd27589 100644 --- a/app/Notifications/Database/BackupFailed.php +++ b/app/Notifications/Database/BackupFailed.php @@ -17,7 +17,7 @@ class BackupFailed extends Notification implements ShouldQueue public $tries = 1; public string $name; - public string $database_name; + public ?string $database_name = null; public string $frequency; public function __construct(ScheduledDatabaseBackup $backup, public $database, public $output) diff --git a/app/Notifications/Database/BackupSuccess.php b/app/Notifications/Database/BackupSuccess.php index 9ca3234e1..d69a31f46 100644 --- a/app/Notifications/Database/BackupSuccess.php +++ b/app/Notifications/Database/BackupSuccess.php @@ -14,7 +14,7 @@ class BackupSuccess extends Notification implements ShouldQueue public $tries = 1; public string $name; - public string $database_name; + public ?string $database_name = null; public string $frequency; public function __construct(ScheduledDatabaseBackup $backup, public $database) diff --git a/config/sentry.php b/config/sentry.php index 2b48e1f14..e833ffdb2 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.269', + 'release' => '4.0.0-beta.270', // 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 bf35359e8..e85b7f5a5 100644 --- a/config/version.php +++ b/config/version.php @@ -1,3 +1,3 @@ -Database backup for {{ $name }} (db:{{$database_name}}) with frequency of {{ $frequency }} was FAILED. +Database backup for {{ $name }} @if($database_name)(db:{{ $database_name }})@endif with frequency of {{ $frequency }} was FAILED. ### Reason diff --git a/resources/views/emails/backup-success.blade.php b/resources/views/emails/backup-success.blade.php index e48df9e6a..d06bca6ce 100644 --- a/resources/views/emails/backup-success.blade.php +++ b/resources/views/emails/backup-success.blade.php @@ -1,3 +1,3 @@ -Database backup for {{ $name }} (db:{{ $database_name }}) with frequency of {{ $frequency }} was successful. +Database backup for {{ $name }} @if($database_name)(db:{{ $database_name }})@endif with frequency of {{ $frequency }} was successful. diff --git a/versions.json b/versions.json index 729055b1f..94e018a75 100644 --- a/versions.json +++ b/versions.json @@ -1,7 +1,7 @@ { "coolify": { "v4": { - "version": "4.0.0-beta.269" + "version": "4.0.0-beta.270" } } } From 714b887274ceec4e4300474f168124c7e0ba4f82 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Sun, 28 Apr 2024 11:18:37 +0200 Subject: [PATCH 3/3] Fix database_name() method to return null instead of "???" --- app/Models/StandaloneMongodb.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Models/StandaloneMongodb.php b/app/Models/StandaloneMongodb.php index 63a6f94dc..30414e26b 100644 --- a/app/Models/StandaloneMongodb.php +++ b/app/Models/StandaloneMongodb.php @@ -224,6 +224,6 @@ class StandaloneMongodb extends BaseModel return $this->morphMany(ScheduledDatabaseBackup::class, 'database'); } public function database_name() { - return "???"; + return null; } }