This commit is contained in:
splin94@yandex.ru 2023-11-19 14:14:52 +03:00
parent 7b82023198
commit 3eecbd85c6
4 changed files with 6 additions and 4 deletions

View File

@ -4,10 +4,10 @@
<option name="directories"> <option name="directories">
<list> <list>
<option value="$PROJECT_DIR$/app/tests" /> <option value="$PROJECT_DIR$/app/tests" />
<option value="$PROJECT_DIR$/code/tests/Unit" />
<option value="$PROJECT_DIR$/code/tests/Feature" />
<option value="$PROJECT_DIR$/code-New/tests/Unit" /> <option value="$PROJECT_DIR$/code-New/tests/Unit" />
<option value="$PROJECT_DIR$/code-New/tests/Feature" /> <option value="$PROJECT_DIR$/code-New/tests/Feature" />
<option value="$PROJECT_DIR$/code/tests/Unit" />
<option value="$PROJECT_DIR$/code/tests/Feature" />
</list> </list>
</option> </option>
</component> </component>

View File

@ -15,12 +15,13 @@ 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+)\|)? ?(\((?<class>\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+\})|(\[\])))/';
public static string $regex = '/^\[(?P<datetime>[^\]]+)\] (?P<environment>\S+)\.(?P<level>\S+): ?(\|(?<pid>\S+)\|)? ?(\((?<class>\S+)\))? (?P<message>.*)? ((?<data>(\{.*\})|(\[.*\]))) ((?<extra>(\{\S+\})|(\[\])))/'; public static string $regex = '/^\[(?P<datetime>[^\]]+)\] (?P<environment>\S+)\.(?P<level>\S+): ?(\|(?<pid>\S+)\|)? ?(\((?<version>\S+)\))? ?(\((?<class>\S+)\))? (?P<message>.*)? ((?<data>(\{.*\})|(\[.*\]))) ((?<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' => 'Version', 'data_path' => 'context.version'],
['label' => 'Class', 'data_path' => 'context.class'], ['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'],
@ -36,6 +37,7 @@ class SynologySSLog extends Log
'environment' => $matches['environment'], 'environment' => $matches['environment'],
'level' => $matches['level'], 'level' => $matches['level'],
'pid' => $matches['pid'], 'pid' => $matches['pid'],
'version' => $matches['version'],
'class' => $matches['class'], 'class' => $matches['class'],
'message' => $matches['message'], 'message' => $matches['message'],
'data' => $matches['data'], 'data' => $matches['data'],

View File

@ -80,7 +80,7 @@ return [
| |
*/ */
'locale' => 'en', 'locale' => 'ru',
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------

Binary file not shown.