cphipps/watchstate
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

renamed suppression message to rule.

Browse Source
This commit is contained in:
Abdulmhsen B. A. A.
2024-06-17 13:26:12 +03:00
parent 20c194ca25
commit d66298e9c6
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/API/System/Suppressor.php
View File

@@ -48,29 +48,29 @@ final class Suppressor
{ {
$params = DataUtil::fromRequest($request); $params = DataUtil::fromRequest($request);
if (null === ($message = $params->get('message')) || empty($message)) { if (null === ($rule = $params->get('rule')) || empty($rule)) {
return api_error('Message text is required.', HTTP_STATUS::HTTP_BAD_REQUEST); return api_error('Rule is required.', HTTP_STATUS::HTTP_BAD_REQUEST);
} }
if (null === ($type = $params->get('type')) || empty($type)) { if (null === ($type = $params->get('type')) || empty($type)) {
return api_error('Message type is required.', HTTP_STATUS::HTTP_BAD_REQUEST); return api_error('Rule type is required.', HTTP_STATUS::HTTP_BAD_REQUEST);
} }
$type = strtolower($type); $type = strtolower($type);
if (null === ($example = $params->get('example')) || empty($example)) { if (null === ($example = $params->get('example')) || empty($example)) {
return api_error('Message example is required.', HTTP_STATUS::HTTP_BAD_REQUEST); return api_error('Rule example is required.', HTTP_STATUS::HTTP_BAD_REQUEST);
} }
if ('regex' === $type) { if ('regex' === $type) {
if (false === @preg_match($message, '')) { if (false === @preg_match($rule, '')) {
return api_error('Invalid regex pattern.', HTTP_STATUS::HTTP_BAD_REQUEST); return api_error('Invalid regex pattern.', HTTP_STATUS::HTTP_BAD_REQUEST);
} }
if (false === @preg_match($message, $example)) { if (false === @preg_match($rule, $example)) {
return api_error('Example does not match the regex pattern.', HTTP_STATUS::HTTP_BAD_REQUEST); return api_error('Example does not match the regex pattern.', HTTP_STATUS::HTTP_BAD_REQUEST);
} }
} else { } else {
if (false === str_contains($example, $message)) { if (false === str_contains($example, $rule)) {
return api_error('Example does not contain the message text.', HTTP_STATUS::HTTP_BAD_REQUEST); return api_error('Example does not contain the message text.', HTTP_STATUS::HTTP_BAD_REQUEST);
} }
} }
@@ -81,7 +81,7 @@ final class Suppressor
$data = [ $data = [
'type' => $type, 'type' => $type,
'message' => $message, 'rule' => $rule,
'example' => $example, 'example' => $example,
]; ];

8
src/Libs/LogSuppressor.php
View File

@@ -58,18 +58,18 @@ final class LogSuppressor implements iHandler
} }
foreach (self::$suppress as $suppress) { foreach (self::$suppress as $suppress) {
$message = ag($suppress, 'message', ''); $rule = ag($suppress, 'rule', '');
if (empty($message)) { if (empty($rule)) {
continue; continue;
} }
if ('regex' === ag($suppress, 'type', 'contains')) { if ('regex' === ag($suppress, 'type', 'contains')) {
if (1 === @preg_match($message, $log)) { if (1 === @preg_match($rule, $log)) {
return true; return true;
} }
continue; continue;
} }
if (str_contains($log, $message)) { if (str_contains($log, $rule)) {
return true; return true;
} }
} }

6
tests/Libs/LogSuppressorTest.php
View File

@@ -17,15 +17,15 @@ class LogSuppressorTest extends TestCase
private array $testData = [ private array $testData = [
'A7434c91d3440' => [ 'A7434c91d3440' => [
'message' => 'Random string', 'rule' => 'Random string',
'type' => 'contains', 'type' => 'contains',
], ],
'A7434c91d3441' => [ 'A7434c91d3441' => [
'message' => '/some random \'(\d+)\'/', 'rule' => '/some random \'(\d+)\'/',
'type' => 'regex', 'type' => 'regex',
], ],
'A7434c91d3442' => [ 'A7434c91d3442' => [
'message' => '', 'rule' => '',
'type' => 'contains', 'type' => 'contains',
], ],
]; ];