diff --git a/app/Models/S3Storage.php b/app/Models/S3Storage.php index 03953d319..21414681c 100644 --- a/app/Models/S3Storage.php +++ b/app/Models/S3Storage.php @@ -46,7 +46,7 @@ class S3Storage extends BaseModel return; } catch (\Throwable $e) { $this->is_usable = false; - if ($this->unusable_email_sent === false) { + if ($this->unusable_email_sent === false && is_transactional_emails_active()) { $mail = new MailMessage(); $mail->subject('Coolify: S3 Storage Connection Error'); $mail->view('emails.s3-connection-error', ['name' => $this->name, 'reason' => $e->getMessage(), 'url' => route('team.storages.show', ['storage_uuid' => $this->uuid])]); diff --git a/app/Notifications/Database/BackupFailed.php b/app/Notifications/Database/BackupFailed.php index dddc1240b..f149a9d06 100644 --- a/app/Notifications/Database/BackupFailed.php +++ b/app/Notifications/Database/BackupFailed.php @@ -3,8 +3,11 @@ namespace App\Notifications\Database; use App\Models\ScheduledDatabaseBackup; +use App\Notifications\Channels\DiscordChannel; +use App\Notifications\Channels\TelegramChannel; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; +use Illuminate\Notifications\Channels\MailChannel; use Illuminate\Notifications\Messages\MailMessage; use Illuminate\Notifications\Notification; @@ -24,7 +27,7 @@ class BackupFailed extends Notification implements ShouldQueue public function via(object $notifiable): array { - return setNotificationChannels($notifiable, 'database_backups'); + return [DiscordChannel::class, TelegramChannel::class, MailChannel::class]; } public function toMail(): MailMessage diff --git a/config/sentry.php b/config/sentry.php index a2621713d..e601b9e8c 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.72', + 'release' => '4.0.0-beta.73', // 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 4f50ad680..8d6fa9270 100644 --- a/config/version.php +++ b/config/version.php @@ -1,3 +1,3 @@