diff --git a/.idea/phpunit.xml b/.idea/phpunit.xml index d9fac3b..0b92a43 100755 --- a/.idea/phpunit.xml +++ b/.idea/phpunit.xml @@ -4,10 +4,10 @@ diff --git a/code/app/Providers/SynologySSLog.php b/code/app/Providers/SynologySSLog.php index e2fb43b..f84e556 100755 --- a/code/app/Providers/SynologySSLog.php +++ b/code/app/Providers/SynologySSLog.php @@ -15,12 +15,13 @@ class SynologySSLog extends Log public static string $name = 'SynologySS'; //public static string $regex = '/^\[(?P[^\]]+)\] (?P\S+)\.(?P\S+): ?(\|(?\S+)\|)? (?P.*)? (\{(?\S+)\}) ?(\[(?\S+|)\])?/'; //public static string $regex = '/^\[(?P[^\]]+)\] (?P\S+)\.(?P\S+): ?(\|(?\S+)\|)? ?(\((?\S+)\))? (?P.*)? ((?(\{\S+\})|(\[\]))) ((?(\{\S+\})|(\[\])))/'; - public static string $regex = '/^\[(?P[^\]]+)\] (?P\S+)\.(?P\S+): ?(\|(?\S+)\|)? ?(\((?\S+)\))? (?P.*)? ((?(\{.*\})|(\[.*\]))) ((?(\{\S+\})|(\[\])))/'; + public static string $regex = '/^\[(?P[^\]]+)\] (?P\S+)\.(?P\S+): ?(\|(?\S+)\|)? ?(\((?\S+)\))? ?(\((?\S+)\))? (?P.*)? ((?(\{.*\})|(\[.*\]))) ((?(\{\S+\})|(\[\])))/'; /** @var array|\string[][] The columns displayed on the frontend, and which data they should display */ public static array $columns = [ ['label' => 'Datetime', 'data_path' => 'datetime'], ['label' => 'Level', 'data_path' => 'level'], ['label' => 'Pid', 'data_path' => 'context.pid'], + ['label' => 'Version', 'data_path' => 'context.version'], ['label' => 'Class', 'data_path' => 'context.class'], ['label' => 'Message', 'data_path' => 'context.message'], ['label' => 'Data', 'data_path' => 'context.data'], @@ -36,6 +37,7 @@ class SynologySSLog extends Log 'environment' => $matches['environment'], 'level' => $matches['level'], 'pid' => $matches['pid'], + 'version' => $matches['version'], 'class' => $matches['class'], 'message' => $matches['message'], 'data' => $matches['data'], diff --git a/code/config/app.php b/code/config/app.php index 79f1db5..a5c00e1 100755 --- a/code/config/app.php +++ b/code/config/app.php @@ -80,7 +80,7 @@ return [ | */ - 'locale' => 'en', + 'locale' => 'ru', /* |-------------------------------------------------------------------------- diff --git a/code/storage/database.sqlite b/code/storage/database.sqlite index b3dc3aa..7c47468 100755 Binary files a/code/storage/database.sqlite and b/code/storage/database.sqlite differ