Skip to content

Commit fae298c

Browse files
authored
The default configuration as mentioned in the readme, isn't actually correctly set for start_of_line_pattern and log_message_pattern (#279)
1 parent 7c33539 commit fae298c

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

src/DependencyInjection/Configuration.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
namespace FD\LogViewer\DependencyInjection;
66

77
use Closure;
8+
use FD\LogViewer\Service\File\Monolog\MonologLineParser;
89
use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
910
use Symfony\Component\Config\Definition\Builder\NodeDefinition;
1011
use Symfony\Component\Config\Definition\Builder\TreeBuilder;
@@ -58,8 +59,8 @@ private function configureLogFiles(): NodeDefinition
5859
],
5960
'downloadable' => false,
6061
'deletable' => false,
61-
'start_of_line_pattern' => null,
62-
'log_message_pattern' => null,
62+
'start_of_line_pattern' => MonologLineParser::START_OF_MESSAGE_PATTERN,
63+
'log_message_pattern' => MonologLineParser::LOG_LINE_PATTERN,
6364
'date_format' => null,
6465
]
6566
]

tests/Integration/DependencyInjection/data/expected-default-config.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
},
1313
"downloadable": false,
1414
"deletable": false,
15-
"start_of_line_pattern": null,
16-
"log_message_pattern": null,
15+
"start_of_line_pattern": "/^\\[\\d{4}-\\d{2}-\\d{2}[^]]*]\\s+\\S+\\.\\S+:/",
16+
"log_message_pattern": "/^\\[(?P<date>[^\\]]+)\\]\\s+(?P<channel>[^\\.]+)\\.(?P<severity>[^:]+):\\s+(?P<message>.*)\\s+(?P<context>(?:{.*?}|\\[.*?]))\\s+(?P<extra>(?:{.*?}|\\[.*?]))\\s+$/s",
1717
"date_format": null
1818
}
1919
},

tests/Integration/DependencyInjection/data/expected-hosts-override-config.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
},
2525
"downloadable": false,
2626
"deletable": false,
27-
"start_of_line_pattern": null,
28-
"log_message_pattern": null,
27+
"start_of_line_pattern": "/^\\[\\d{4}-\\d{2}-\\d{2}[^]]*]\\s+\\S+\\.\\S+:/",
28+
"log_message_pattern": "/^\\[(?P<date>[^\\]]+)\\]\\s+(?P<channel>[^\\.]+)\\.(?P<severity>[^:]+):\\s+(?P<message>.*)\\s+(?P<context>(?:{.*?}|\\[.*?]))\\s+(?P<extra>(?:{.*?}|\\[.*?]))\\s+$/s",
2929
"date_format": null
3030
}
3131
}

0 commit comments

Comments
 (0)