FGFS-4.1/phpvms
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Catch error messages in notifying (#403)

Browse Source 
* Catch error messages in notifying

* Formatting
This commit is contained in:
Nabeel S
2019-09-17 19:11:02 -04:00
committed by GitHub
parent 6e9dcf8a31
commit 5f9e7d5754
1 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
app/Listeners/NotificationEvents.php
View File

@@ -40,7 +40,25 @@ class NotificationEvents extends Listener
protected function notifyAdmins($notification) protected function notifyAdmins($notification)
{ {
$admin_users = User::whereRoleIs('admin')->get(); $admin_users = User::whereRoleIs('admin')->get();
Notification::send($admin_users, $notification);
try {
Notification::send($admin_users, $notification);
} catch (\Exception $e) {
Log::emergency('Error emailing admins, malformed email='.$e->getMessage());
}
}
/**
* @param User $user
* @param \Illuminate\Notifications\Notification $notification
*/
protected function notifyUser($user, $notification)
{
try {
$user->notify($notification);
} catch (\Exception $e) {
Log::emergency('Error emailing admins, malformed email='.$e->getMessage());
}
} }
/** /**
@@ -64,9 +82,9 @@ class NotificationEvents extends Listener
* Send the user a confirmation email * Send the user a confirmation email
*/ */
if ($event->user->state === UserState::ACTIVE) { if ($event->user->state === UserState::ACTIVE) {
$event->user->notify(new \App\Notifications\UserRegistered($event->user)); $this->notifyUser($event->user, new \App\Notifications\UserRegistered($event->user));
} elseif ($event->user->state === UserState::PENDING) { } elseif ($event->user->state === UserState::PENDING) {
$event->user->notify(new \App\Notifications\UserPending($event->user)); $this->notifyUser($event->user, new \App\Notifications\UserPending($event->user));
} }
} }
@@ -81,9 +99,9 @@ class NotificationEvents extends Listener
if ($event->old_state === UserState::PENDING) { if ($event->old_state === UserState::PENDING) {
if ($event->user->state === UserState::ACTIVE) { if ($event->user->state === UserState::ACTIVE) {
$event->user->notify(new \App\Notifications\UserRegistered($event->user)); $this->notifyUser($event->user, new \App\Notifications\UserRegistered($event->user));
} elseif ($event->user->state === UserState::REJECTED) { } elseif ($event->user->state === UserState::REJECTED) {
$event->user->notify(new \App\Notifications\UserRejected($event->user)); $this->notifyUser($event->user, new \App\Notifications\UserRejected($event->user));
} }
} elseif ($event->old_state === UserState::ACTIVE) { } elseif ($event->old_state === UserState::ACTIVE) {
Log::info('User state change from active to ??'); Log::info('User state change from active to ??');
@@ -109,7 +127,7 @@ class NotificationEvents extends Listener
public function onPirepAccepted(PirepAccepted $event): void public function onPirepAccepted(PirepAccepted $event): void
{ {
Log::info('NotificationEvents::onPirepAccepted: '.$event->pirep->id.' accepted'); Log::info('NotificationEvents::onPirepAccepted: '.$event->pirep->id.' accepted');
$event->pirep->user->notify(new \App\Notifications\PirepAccepted($event->pirep)); $this->notifyUser($event->pirep->user, new \App\Notifications\PirepAccepted($event->pirep));
} }
/** /**
@@ -120,6 +138,6 @@ class NotificationEvents extends Listener
public function onPirepRejected(PirepRejected $event): void public function onPirepRejected(PirepRejected $event): void
{ {
Log::info('NotificationEvents::onPirepRejected: '.$event->pirep->id.' rejected'); Log::info('NotificationEvents::onPirepRejected: '.$event->pirep->id.' rejected');
$event->pirep->user->notify(new \App\Notifications\PirepRejected($event->pirep)); $this->notifyUser($event->pirep->user, new \App\Notifications\PirepRejected($event->pirep));
} }
} }