Skip to content

missing consideration of the set log level #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SeifertDaniel wants to merge 3 commits into
base: master
Choose a base branch
from
Open

missing consideration of the set log level #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3d3ce2e
considers log levels to be recorded from settings
SeifertDaniel Jan 31, 2020
d8dc434
change settings to new PHP error level option
SeifertDaniel Jan 31, 2020
14b80c3
Merge branch 'master' into master
alfredbez Feb 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions Core/ErrorTypes.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?php

namespace OxidProfessionalServices\Sentry\Core;

use function Exception;

class ErrorTypes
{
public static $typeClasses = [
'info' => E_ALL,
'warning' => E_ALL & ~E_NOTICE & ~E_USER_NOTICE & ~E_STRICT,
'error' => E_ALL & ~E_NOTICE & ~E_USER_NOTICE & ~E_STRICT & ~E_DEPRECATED
& ~E_USER_DEPRECATED & ~E_WARNING & ~E_USER_WARNING,
'fatal' => E_ALL & ~E_NOTICE & ~E_USER_NOTICE & ~E_STRICT & ~E_DEPRECATED
& ~E_USER_DEPRECATED & ~E_WARNING & ~E_USER_WARNING & ~E_RECOVERABLE_ERROR & ~E_USER_ERROR,
'none' => E_ALL & ~E_NOTICE & ~E_USER_NOTICE & ~E_STRICT & ~E_DEPRECATED
& ~E_USER_DEPRECATED & ~E_WARNING & ~E_USER_WARNING & ~E_RECOVERABLE_ERROR & ~E_USER_ERROR
& ~E_ERROR & ~E_PARSE & ~E_CORE_ERROR & ~E_CORE_WARNING & ~E_COMPILE_ERROR & ~E_COMPILE_WARNING
];

public static function getTypeClasses()
{
return array_keys(self::$typeClasses);
}

public static function getTypesByClass($typeClass)
{
if (false === self::$typeClasses[trim(strtolower($typeClass))]) {
throw oxNew( Exception( "unknown error type class $typeClass"));
}

return self::$typeClasses[trim(strtolower($typeClass))];
}
}
4 changes: 4 additions & 0 deletions Traits/ShopcontrolTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
namespace OxidProfessionalServices\Sentry\Traits;

use OxidEsales\Eshop\Core\Registry;
use OxidProfessionalServices\Sentry\Core\ErrorTypes;

use function Sentry\init;

Expand All @@ -16,6 +17,9 @@ public function start($sClass = null, $sFunction = null, $aParams = null, $aView
'dsn' => $sentryUrl,
'environment' => Registry::getConfig()->getConfigParam('oxpsSentryEnvirnoment'),
'http_proxy' => Registry::getConfig()->getConfigParam('oxpsSentryProxy') ?: null,
'error_types' => ErrorTypes::getTypesByClass(
Registry::getConfig()->getConfigParam('oxpsSentryPHPErrorLevel') ?: 'info'
)
]);
}

Expand Down
9 changes: 9 additions & 0 deletions metadata.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

use OxidProfessionalServices\Sentry\Core\ErrorTypes;

$sMetadataVersion = '2.1';

$aModule = [
Expand Down Expand Up @@ -54,5 +56,12 @@
'value' => 'none',
'constraints' => 'none|emergency|alert|critical|error|warning|notice|info|debug',
],
[
'group' => 'main',
'name' => 'oxpsSentryPHPErrorLevel',
'type' => 'select',
'value' => 'info',
'constraints' => implode('|', ErrorTypes::getTypeClasses())
]
],
];
40 changes: 23 additions & 17 deletions views/admin/de/oxpssentry_admin_de_lang.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,29 @@
$sLangName = 'Deutsch';

$aLang = [
'charset' => 'UTF-8',
'oxpssentry' => 'Sentry Integration für OXID',
'charset' => 'UTF-8',
'oxpssentry' => 'Sentry Integration für OXID',

// Settings
'SHOP_MODULE_GROUP_main' => 'Allgemein',
'SHOP_MODULE_oxpsSentryEnvirnoment' => 'Name des Environments',
'SHOP_MODULE_oxpsSentryPhpUrl' => 'PHP-API Url',
'SHOP_MODULE_oxpsSentryProxy' => 'Proxy',
'SHOP_MODULE_oxpsSentryJsUrl' => 'JS-API Url',
'SHOP_MODULE_oxpsSentryLogLevel' => 'Log-Level, die direkt an sentry gesendet werden sollen',
'SHOP_MODULE_oxpsSentryLogLevel_none' => 'none',
'SHOP_MODULE_oxpsSentryLogLevel_emergency' => 'emergency',
'SHOP_MODULE_oxpsSentryLogLevel_alert' => 'alert',
'SHOP_MODULE_oxpsSentryLogLevel_critical' => 'critical',
'SHOP_MODULE_oxpsSentryLogLevel_error' => 'error',
'SHOP_MODULE_oxpsSentryLogLevel_warning' => 'warning',
'SHOP_MODULE_oxpsSentryLogLevel_notice' => 'notice',
'SHOP_MODULE_oxpsSentryLogLevel_info' => 'info',
'SHOP_MODULE_oxpsSentryLogLevel_debug' => 'debug',
'SHOP_MODULE_GROUP_main' => 'Allgemein',
'SHOP_MODULE_oxpsSentryEnvirnoment' => 'Name des Environments',
'SHOP_MODULE_oxpsSentryPhpUrl' => 'PHP-API Url',
'SHOP_MODULE_oxpsSentryProxy' => 'Proxy',
'SHOP_MODULE_oxpsSentryJsUrl' => 'JS-API Url',
'SHOP_MODULE_oxpsSentryLogLevel' => 'Log-Level, die direkt an sentry gesendet werden sollen',
'SHOP_MODULE_oxpsSentryLogLevel_none' => 'none',
'SHOP_MODULE_oxpsSentryLogLevel_emergency' => 'emergency',
'SHOP_MODULE_oxpsSentryLogLevel_alert' => 'alert',
'SHOP_MODULE_oxpsSentryLogLevel_critical' => 'critical',
'SHOP_MODULE_oxpsSentryLogLevel_error' => 'error',
'SHOP_MODULE_oxpsSentryLogLevel_warning' => 'warning',
'SHOP_MODULE_oxpsSentryLogLevel_notice' => 'notice',
'SHOP_MODULE_oxpsSentryLogLevel_info' => 'info',
'SHOP_MODULE_oxpsSentryLogLevel_debug' => 'debug',
'SHOP_MODULE_oxpsSentryPHPErrorLevel' => 'zu übertragende PHP Error Level',
'SHOP_MODULE_oxpsSentryPHPErrorLevel_none' => 'keine',
'SHOP_MODULE_oxpsSentryPHPErrorLevel_error' => 'Fehler und höher',
'SHOP_MODULE_oxpsSentryPHPErrorLevel_warning' => 'Warnungen und höher',
'SHOP_MODULE_oxpsSentryPHPErrorLevel_info' => 'Info und höher',
'SHOP_MODULE_oxpsSentryPHPErrorLevel_fatal' => 'fatale Fehler und höher',
];
40 changes: 23 additions & 17 deletions views/admin/en/oxpssentry_admin_en_lang.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,29 @@
$sLangName = 'English';

$aLang = [
'charset' => 'UTF-8',
'oxpssentry' => 'Sentry integration for OXID',
'charset' => 'UTF-8',
'oxpssentry' => 'Sentry integration for OXID',

// Settings
'SHOP_MODULE_GROUP_main' => 'General',
'SHOP_MODULE_oxpsSentryEnvirnoment' => 'Environment Name',
'SHOP_MODULE_oxpsSentryPhpUrl' => 'PHP-API Url',
'SHOP_MODULE_oxpsSentryProxy' => 'Proxy',
'SHOP_MODULE_oxpsSentryJsUrl' => 'JS-API Url',
'SHOP_MODULE_oxpsSentryLogLevel' => 'Log-Level, to send logs directly to sentry',
'SHOP_MODULE_oxpsSentryLogLevel_none' => 'none',
'SHOP_MODULE_oxpsSentryLogLevel_emergency' => 'emergency',
'SHOP_MODULE_oxpsSentryLogLevel_alert' => 'alert',
'SHOP_MODULE_oxpsSentryLogLevel_critical' => 'critical',
'SHOP_MODULE_oxpsSentryLogLevel_error' => 'error',
'SHOP_MODULE_oxpsSentryLogLevel_warning' => 'warning',
'SHOP_MODULE_oxpsSentryLogLevel_notice' => 'notice',
'SHOP_MODULE_oxpsSentryLogLevel_info' => 'info',
'SHOP_MODULE_oxpsSentryLogLevel_debug' => 'debug',
'SHOP_MODULE_GROUP_main' => 'General',
'SHOP_MODULE_oxpsSentryEnvirnoment' => 'Environment Name',
'SHOP_MODULE_oxpsSentryPhpUrl' => 'PHP-API Url',
'SHOP_MODULE_oxpsSentryProxy' => 'Proxy',
'SHOP_MODULE_oxpsSentryJsUrl' => 'JS-API Url',
'SHOP_MODULE_oxpsSentryLogLevel' => 'Log-Level, to send logs directly to sentry',
'SHOP_MODULE_oxpsSentryLogLevel_none' => 'none',
'SHOP_MODULE_oxpsSentryLogLevel_emergency' => 'emergency',
'SHOP_MODULE_oxpsSentryLogLevel_alert' => 'alert',
'SHOP_MODULE_oxpsSentryLogLevel_critical' => 'critical',
'SHOP_MODULE_oxpsSentryLogLevel_error' => 'error',
'SHOP_MODULE_oxpsSentryLogLevel_warning' => 'warning',
'SHOP_MODULE_oxpsSentryLogLevel_notice' => 'notice',
'SHOP_MODULE_oxpsSentryLogLevel_info' => 'info',
'SHOP_MODULE_oxpsSentryLogLevel_debug' => 'debug',
'SHOP_MODULE_oxpsSentryPHPErrorLevel' => 'PHP error levels to be send',
'SHOP_MODULE_oxpsSentryPHPErrorLevel_none' => 'none',
'SHOP_MODULE_oxpsSentryPHPErrorLevel_error' => 'errors and above',
'SHOP_MODULE_oxpsSentryPHPErrorLevel_warning' => 'warnings and above',
'SHOP_MODULE_oxpsSentryPHPErrorLevel_info' => 'infos and above',
'SHOP_MODULE_oxpsSentryPHPErrorLevel_fatal' => 'fatal errors and above',
];