dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix: send internal notifications of email errors

Browse Source
This commit is contained in:
Andras Bacsai
2023-09-18 15:19:27 +02:00
parent 3eb1a1f48c
commit 1452cdf5ad
8 changed files with 26 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Livewire/Boarding/Index.php
View File

@@ -69,14 +69,6 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
public function restartBoarding() public function restartBoarding()
{ {
// if ($this->selectedServerType !== 'localhost') {
// if ($this->createdServer) {
// $this->createdServer->delete();
// }
// if ($this->createdPrivateKey) {
// $this->createdPrivateKey->delete();
// }
// }
return redirect()->route('boarding'); return redirect()->route('boarding');
} }
public function skipBoarding() public function skipBoarding()

1
app/Jobs/ContainerStatusJob.php
View File

@@ -86,7 +86,6 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
$this->server->team->notify(new ContainerRestarted('coolify-proxy', $this->server)); $this->server->team->notify(new ContainerRestarted('coolify-proxy', $this->server));
} }
} else { } else {
ray($foundProxyContainer);
$this->server->proxy->status = data_get($foundProxyContainer, 'State.Status'); $this->server->proxy->status = data_get($foundProxyContainer, 'State.Status');
$this->server->save(); $this->server->save();
} }

2
app/Notifications/Application/DeploymentFailed.php
View File

@@ -14,7 +14,7 @@ class DeploymentFailed extends Notification implements ShouldQueue
{ {
use Queueable; use Queueable;
public $tries = 5; public $tries = 1;
public Application $application; public Application $application;
public ?ApplicationPreview $preview = null; public ?ApplicationPreview $preview = null;

2
app/Notifications/Application/DeploymentSuccess.php
View File

@@ -14,7 +14,7 @@ class DeploymentSuccess extends Notification implements ShouldQueue
{ {
use Queueable; use Queueable;
public $tries = 5; public $tries = 1;
public Application $application; public Application $application;
public ApplicationPreview|null $preview = null; public ApplicationPreview|null $preview = null;

2
app/Notifications/Application/StatusChanged.php
View File

@@ -13,7 +13,7 @@ class StatusChanged extends Notification implements ShouldQueue
{ {
use Queueable; use Queueable;
public $tries = 5; public $tries = 1;
public Application $application; public Application $application;
public string $application_name; public string $application_name;

36
app/Notifications/Channels/EmailChannel.php
View File

@@ -12,23 +12,29 @@ class EmailChannel
{ {
public function send(SendsEmail $notifiable, Notification $notification): void public function send(SendsEmail $notifiable, Notification $notification): void
{ {
$this->bootConfigs($notifiable); try {
$recepients = $notifiable->getRecepients($notification); $this->bootConfigs($notifiable);
$recepients = $notifiable->getRecepients($notification);
ray($recepients);
if (count($recepients) === 0) {
throw new Exception('No email recipients found');
}
if (count($recepients) === 0) { $mailMessage = $notification->toMail($notifiable);
throw new Exception('No email recipients found'); throw new Exception('EmailChannel is disabled');
Mail::send(
[],
[],
fn (Message $message) => $message
->to($recepients)
->subject($mailMessage->subject)
->html((string)$mailMessage->render())
);
} catch (Exception $e) {
ray($e->getMessage());
send_internal_notification("EmailChannel error: {$e->getMessage()}. Failed to send email to: " . implode(', ', $recepients) . " with subject: {$mailMessage->subject}");
throw $e;
} }
$mailMessage = $notification->toMail($notifiable);
ray("Sending email to: " . implode(', ', $recepients) . " with subject: {$mailMessage->subject}");
Mail::send(
[],
[],
fn (Message $message) => $message
->to($recepients)
->subject($mailMessage->subject)
->html((string)$mailMessage->render())
);
} }
private function bootConfigs($notifiable): void private function bootConfigs($notifiable): void

4
app/Notifications/Database/BackupFailed.php
View File

@@ -3,8 +3,6 @@
namespace App\Notifications\Database; namespace App\Notifications\Database;
use App\Models\ScheduledDatabaseBackup; use App\Models\ScheduledDatabaseBackup;
use App\Notifications\Channels\DiscordChannel;
use App\Notifications\Channels\EmailChannel;
use Illuminate\Bus\Queueable; use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Notifications\Messages\MailMessage; use Illuminate\Notifications\Messages\MailMessage;
@@ -14,7 +12,7 @@ class BackupFailed extends Notification implements ShouldQueue
{ {
use Queueable; use Queueable;
public $tries = 5; public $tries = 1;
public string $name; public string $name;
public string $frequency; public string $frequency;

4
app/Notifications/Database/BackupSuccess.php
View File

@@ -3,8 +3,6 @@
namespace App\Notifications\Database; namespace App\Notifications\Database;
use App\Models\ScheduledDatabaseBackup; use App\Models\ScheduledDatabaseBackup;
use App\Notifications\Channels\DiscordChannel;
use App\Notifications\Channels\EmailChannel;
use Illuminate\Bus\Queueable; use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Notifications\Messages\MailMessage; use Illuminate\Notifications\Messages\MailMessage;
@@ -14,7 +12,7 @@ class BackupSuccess extends Notification implements ShouldQueue
{ {
use Queueable; use Queueable;
public $tries = 5; public $tries = 1;
public string $name; public string $name;
public string $frequency; public string $frequency;