From 1139acd9f3e026a648e3d00b7cbf4036c17518c9 Mon Sep 17 00:00:00 2001 From: spencerrlongg Date: Tue, 1 Oct 2024 13:36:47 -0500 Subject: [PATCH 1/3] catch errors around request notifications --- app/Http/Controllers/ViewAssetsController.php | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/ViewAssetsController.php b/app/Http/Controllers/ViewAssetsController.php index db4afc832..2ebb12f0d 100755 --- a/app/Http/Controllers/ViewAssetsController.php +++ b/app/Http/Controllers/ViewAssetsController.php @@ -13,6 +13,7 @@ use App\Notifications\RequestAssetNotification; use Illuminate\Http\Request; use Illuminate\Http\RedirectResponse; use \Illuminate\Contracts\View\View; +use Log; /** * This controller handles all actions related to the ability for users @@ -179,8 +180,11 @@ class ViewAssetsController extends Controller $asset->decrement('requests_counter', 1); $logaction->logaction('request canceled'); - $settings->notify(new RequestAssetCancelation($data)); - + try { + $settings->notify(new RequestAssetCancelation($data)); + } catch (\Exception $e) { + Log::error($e); + } return redirect()->route('requestable-assets') ->with('success')->with('success', trans('admin/hardware/message.requests.canceled')); } @@ -188,7 +192,11 @@ class ViewAssetsController extends Controller $logaction->logaction('requested'); $asset->request(); $asset->increment('requests_counter', 1); - $settings->notify(new RequestAssetNotification($data)); + try { + $settings->notify(new RequestAssetNotification($data)); + } catch (\Exception $e) { + Log::error($e); + } return redirect()->route('requestable-assets')->with('success')->with('success', trans('admin/hardware/message.requests.success')); } From 9a651b567d0c3c463f781b8e5b87609113b0fdd0 Mon Sep 17 00:00:00 2001 From: spencerrlongg Date: Tue, 1 Oct 2024 14:24:03 -0500 Subject: [PATCH 2/3] change error to warning --- app/Http/Controllers/ViewAssetsController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/ViewAssetsController.php b/app/Http/Controllers/ViewAssetsController.php index 2ebb12f0d..12c300e5b 100755 --- a/app/Http/Controllers/ViewAssetsController.php +++ b/app/Http/Controllers/ViewAssetsController.php @@ -183,7 +183,7 @@ class ViewAssetsController extends Controller try { $settings->notify(new RequestAssetCancelation($data)); } catch (\Exception $e) { - Log::error($e); + Log::warning($e); } return redirect()->route('requestable-assets') ->with('success')->with('success', trans('admin/hardware/message.requests.canceled')); @@ -195,7 +195,7 @@ class ViewAssetsController extends Controller try { $settings->notify(new RequestAssetNotification($data)); } catch (\Exception $e) { - Log::error($e); + Log::warning($e); } return redirect()->route('requestable-assets')->with('success')->with('success', trans('admin/hardware/message.requests.success')); From 8232618a9f8868cd1c5495fe301544fd3461a2d5 Mon Sep 17 00:00:00 2001 From: spencerrlongg Date: Tue, 1 Oct 2024 14:26:32 -0500 Subject: [PATCH 3/3] change the other one too --- app/Http/Controllers/Account/AcceptanceController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Account/AcceptanceController.php b/app/Http/Controllers/Account/AcceptanceController.php index c6cdf9bbf..e29fa7c63 100644 --- a/app/Http/Controllers/Account/AcceptanceController.php +++ b/app/Http/Controllers/Account/AcceptanceController.php @@ -240,7 +240,7 @@ class AcceptanceController extends Controller try { $acceptance->notify(new AcceptanceAssetAcceptedNotification($data)); } catch (\Exception $e) { - Log::error($e); + Log::warning($e); } event(new CheckoutAccepted($acceptance));