From 919cad01a0edf1265773f6917896d6ad1c94fdd9 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Fri, 12 Mar 2021 12:12:02 +0300 Subject: [PATCH 1/3] #3540 Sentry Enabled/Disabled add Senttings --- .../advs-module/resources/config/settings/sections.php | 1 + .../advs-module/resources/config/settings/settings.php | 3 ++- .../visiosoft/advs-module/resources/lang/en/setting.php | 3 +++ app/Exceptions/ExceptionHandler.php | 2 +- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/addons/default/visiosoft/advs-module/resources/config/settings/sections.php b/addons/default/visiosoft/advs-module/resources/config/settings/sections.php index 9222867a3..f22cddc23 100644 --- a/addons/default/visiosoft/advs-module/resources/config/settings/sections.php +++ b/addons/default/visiosoft/advs-module/resources/config/settings/sections.php @@ -17,6 +17,7 @@ return [ 'hide_price_categories', 'tcmb_exchange_url', 'enabled_currencies', + 'close_sentry', ], ], 'ads' => [ diff --git a/addons/default/visiosoft/advs-module/resources/config/settings/settings.php b/addons/default/visiosoft/advs-module/resources/config/settings/settings.php index dded12c5b..181e4e805 100644 --- a/addons/default/visiosoft/advs-module/resources/config/settings/settings.php +++ b/addons/default/visiosoft/advs-module/resources/config/settings/settings.php @@ -415,5 +415,6 @@ return [ 'config' => [ 'default_value' => false, ] - ] + ], + 'close_sentry' => 'anomaly.field_type.boolean', ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/en/setting.php b/addons/default/visiosoft/advs-module/resources/lang/en/setting.php index 01f5e9639..034aed70a 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/setting.php @@ -247,4 +247,7 @@ return [ 'name' => 'GET Categories', 'instructions' => 'It represents the categories in which the GET property will be valid.' ], + 'close_sentry' => [ + 'name' => 'Disable Sentry' + ] ]; diff --git a/app/Exceptions/ExceptionHandler.php b/app/Exceptions/ExceptionHandler.php index a789a8e71..af7768299 100644 --- a/app/Exceptions/ExceptionHandler.php +++ b/app/Exceptions/ExceptionHandler.php @@ -87,7 +87,7 @@ class ExceptionHandler extends Handler public function report(Exception $e) { - if (app()->bound('sentry') && $this->shouldReport($e)) { + if (!setting_value('visiosoft.module.advs::close_sentry') && app()->bound('sentry') && $this->shouldReport($e)) { app('sentry')->captureException($e); } From 4cea143922377966e8e9ebb010f8f12507bc5105 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Fri, 12 Mar 2021 12:13:24 +0300 Subject: [PATCH 2/3] #3540 Sentry Enabled/Disabled add Senttings --- .../advs-module/resources/config/settings/sections.php | 2 +- .../advs-module/resources/config/settings/settings.php | 2 +- .../default/visiosoft/advs-module/resources/lang/en/setting.php | 2 +- app/Exceptions/ExceptionHandler.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/default/visiosoft/advs-module/resources/config/settings/sections.php b/addons/default/visiosoft/advs-module/resources/config/settings/sections.php index f22cddc23..ab3f3904a 100644 --- a/addons/default/visiosoft/advs-module/resources/config/settings/sections.php +++ b/addons/default/visiosoft/advs-module/resources/config/settings/sections.php @@ -17,7 +17,7 @@ return [ 'hide_price_categories', 'tcmb_exchange_url', 'enabled_currencies', - 'close_sentry', + 'disable_sentry', ], ], 'ads' => [ diff --git a/addons/default/visiosoft/advs-module/resources/config/settings/settings.php b/addons/default/visiosoft/advs-module/resources/config/settings/settings.php index 181e4e805..436ca2ba6 100644 --- a/addons/default/visiosoft/advs-module/resources/config/settings/settings.php +++ b/addons/default/visiosoft/advs-module/resources/config/settings/settings.php @@ -416,5 +416,5 @@ return [ 'default_value' => false, ] ], - 'close_sentry' => 'anomaly.field_type.boolean', + 'disable_sentry' => 'anomaly.field_type.boolean', ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/en/setting.php b/addons/default/visiosoft/advs-module/resources/lang/en/setting.php index 034aed70a..7e06bcedb 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/setting.php @@ -247,7 +247,7 @@ return [ 'name' => 'GET Categories', 'instructions' => 'It represents the categories in which the GET property will be valid.' ], - 'close_sentry' => [ + 'disable_sentry' => [ 'name' => 'Disable Sentry' ] ]; diff --git a/app/Exceptions/ExceptionHandler.php b/app/Exceptions/ExceptionHandler.php index af7768299..316887aca 100644 --- a/app/Exceptions/ExceptionHandler.php +++ b/app/Exceptions/ExceptionHandler.php @@ -87,7 +87,7 @@ class ExceptionHandler extends Handler public function report(Exception $e) { - if (!setting_value('visiosoft.module.advs::close_sentry') && app()->bound('sentry') && $this->shouldReport($e)) { + if (!setting_value('visiosoft.module.advs::disable_sentry') && app()->bound('sentry') && $this->shouldReport($e)) { app('sentry')->captureException($e); } From 707faec5be05c5e94cf333c539a63e9a2ba123b8 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Fri, 12 Mar 2021 12:54:47 +0300 Subject: [PATCH 3/3] #3540 Sentry Enabled/Disabled add Senttings --- app/Exceptions/ExceptionHandler.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/Exceptions/ExceptionHandler.php b/app/Exceptions/ExceptionHandler.php index 316887aca..79492d1b8 100644 --- a/app/Exceptions/ExceptionHandler.php +++ b/app/Exceptions/ExceptionHandler.php @@ -87,7 +87,11 @@ class ExceptionHandler extends Handler public function report(Exception $e) { - if (!setting_value('visiosoft.module.advs::disable_sentry') && app()->bound('sentry') && $this->shouldReport($e)) { + if (!setting_value('visiosoft.module.advs::disable_sentry') + && app()->bound('sentry') + && $this->shouldReport($e) + && env('SENTRY_LARAVEL_DSN')) { + app('sentry')->captureException($e); }