tyler.durden
/
squidanalyzer
mirror of https://github.com/darold/squidanalyzer.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix parser issue when squid logformat has additional field at end. Thanks to nuxsmin for the patch.

This commit is contained in:
Darold Gilles 2013-01-10 09:48:25 +01:00
parent 0dc0e7a5f6
commit dfa1b3097a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SquidAnalyzer.pm
View File

@ -195,10 +195,10 @@ sub parseFile
if ( $line =~ s#^(\d+\.\d{3})\s+(\d+)\s+([^\s]+)\s+([^\s]+)\s+(\d+)\s+([^\s]+)\s+## ) {
$time = $1 || 0;
$elapsed = $2 || 0;
$client_ip = $3 || '';
$code = $4 || '';
$bytes = $5 || 0;
$method = $6 || '';
$client_ip = $3 || '';
# Go to last parsed date (incremental mode)
next if ($self->{history_time} && ($time <= $self->{history_time}));
@ -220,7 +220,7 @@ sub parseFile
next;
}
if ( $line =~ s#^(.*)\s+([^\s]+)\s+([^\s]+\/[^\s]+)\s+([^\s]+)\s*## ) {
if ( $line =~ s#^(.*?)\s+([^\s]+)\s+([^\s]+\/[^\s]+)\s+([^\s]+)\s*## ) {
$url = lc($1) || '';
$login = lc($2) || '';
$status = lc($3) || '';