This commit is contained in:
splin94@yandex.ru 2023-11-15 12:27:41 +00:00
parent aab36c2434
commit 2c6275fb44
2 changed files with 3 additions and 1 deletions

View File

@ -14,13 +14,14 @@ class SynologySSLog extends Log
{ {
public static string $name = 'SynologySS'; public static string $name = 'SynologySS';
//public static string $regex = '/^\[(?P<datetime>[^\]]+)\] (?P<environment>\S+)\.(?P<level>\S+): ?(\|(?<pid>\S+)\|)? (?P<message>.*)? (\{(?<data>\S+)\}) ?(\[(?<extra>\S+|)\])?/'; //public static string $regex = '/^\[(?P<datetime>[^\]]+)\] (?P<environment>\S+)\.(?P<level>\S+): ?(\|(?<pid>\S+)\|)? (?P<message>.*)? (\{(?<data>\S+)\}) ?(\[(?<extra>\S+|)\])?/';
public static string $regex = '/^\[(?P<datetime>[^\]]+)\] (?P<environment>\S+)\.(?P<level>\S+): ?(\|(?<pid>\S+)\|)? (?P<message>.*)? ((?<data>(\{\S+\})|(\[\]))) ((?<extra>(\{\S+\})|(\[\])))/'; public static string $regex = '/^\[(?P<datetime>[^\]]+)\] (?P<environment>\S+)\.(?P<level>\S+): ?(\|(?<pid>\S+)\|)? ?(\((?<class>\S+)\))? (?P<message>.*)? ((?<data>(\{\S+\})|(\[\]))) ((?<extra>(\{\S+\})|(\[\])))/';
/** @var array|\string[][] The columns displayed on the frontend, and which data they should display */ /** @var array|\string[][] The columns displayed on the frontend, and which data they should display */
public static array $columns = [ public static array $columns = [
['label' => 'Datetime', 'data_path' => 'datetime'], ['label' => 'Datetime', 'data_path' => 'datetime'],
['label' => 'Level', 'data_path' => 'level'], ['label' => 'Level', 'data_path' => 'level'],
['label' => 'Pid', 'data_path' => 'context.pid'], ['label' => 'Pid', 'data_path' => 'context.pid'],
['label' => 'Class', 'data_path' => 'context.class'],
['label' => 'Message', 'data_path' => 'context.message'], ['label' => 'Message', 'data_path' => 'context.message'],
['label' => 'Data', 'data_path' => 'context.data'], ['label' => 'Data', 'data_path' => 'context.data'],
]; ];
@ -35,6 +36,7 @@ class SynologySSLog extends Log
'environment' => $matches['environment'], 'environment' => $matches['environment'],
'level' => $matches['level'], 'level' => $matches['level'],
'pid' => $matches['pid'], 'pid' => $matches['pid'],
'class' => $matches['class'],
'message' => $matches['message'], 'message' => $matches['message'],
'data' => $matches['data'], 'data' => $matches['data'],
'extra' => $matches['extra'], 'extra' => $matches['extra'],

Binary file not shown.