tyler.durden/squidanalyzer
1
0
Fork 0
mirror of https://github.com/darold/squidanalyzer.git synced 2025-07-31 01:44:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix top url report that was not cumulate statistics anymore. Thanks to Wesley Bresson for the report.

Browse Source
This commit is contained in:
Darold Gilles 2016-03-12 19:23:03 +01:00
parent b6bbf6130a
commit 1728133bc4
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
SquidAnalyzer.pm
View File

@ -4534,13 +4534,13 @@ sub _print_user_detail
if ($data =~ /hits=(\d+);bytes=(\d+);duration=([\-\d]+);first=([^;]*);last=([^;]*);url=(.*?);cache_hit=(\d*);cache_bytes=(\d*)/) {
my $url = $6;
$url_stat{$url}{hits} = $1;
$url_stat{$url}{bytes} = $2;
$url_stat{$url}{duration} = abs($3);
$url_stat{$url}{hits} += $1;
$url_stat{$url}{bytes} += $2;
$url_stat{$url}{duration} += abs($3);
$url_stat{$url}{firsthit} = $4 if (!$url_stat{$url}{firsthit} || ($4 < $url_stat{$url}{firsthit}));
$url_stat{$url}{lasthit} = $5 if (!$url_stat{$url}{lasthit} || ($5 > $url_stat{$url}{lasthit}));
$url_stat{$url}{cache_hit} = $7;
$url_stat{$url}{cache_bytes} = $8;
$url_stat{$url}{cache_hit} += $7;
$url_stat{$url}{cache_bytes} += $8;
if ($self->check_exclusions('','',$url)) {
delete $url_stat{$url};
next;
@ -4556,9 +4556,9 @@ sub _print_user_detail
}
} elsif ($data =~ /hits=(\d+);bytes=(\d+);duration=([\-\d]+);first=([^;]*);last=([^;]*);url=(.*)/) {
my $url = $6;
$url_stat{$6}{hits} = $1;
$url_stat{$6}{bytes} = $2;
$url_stat{$6}{duration} = abs($3);
$url_stat{$6}{hits} += $1;
$url_stat{$6}{bytes} += $2;
$url_stat{$6}{duration} += abs($3);
$url_stat{$6}{firsthit} = $4 if (!$url_stat{$6}{firsthit} || ($4 < $url_stat{$6}{firsthit}));
$url_stat{$6}{lasthit} = $5 if (!$url_stat{$6}{lasthit} || ($5 > $url_stat{$6}{lasthit}));
if ($self->{rebuild}) {
@ -4573,8 +4573,8 @@ sub _print_user_detail
} elsif ($data =~ /hits=(\d+);bytes=(\d+);duration=([\-\d]+);url=(.*)/) {
my $url = $4;
$url_stat{$4}{hits} = $1;
$url_stat{$4}{bytes} = $2;
$url_stat{$4}{hits} += $1;
$url_stat{$4}{bytes} += $2;
$url_stat{$4}{duration} = abs($3);
if ($self->{rebuild}) {
if ($self->check_exclusions('','',$url)) {
@ -4737,13 +4737,13 @@ sub _print_top_url_stat
if ($data =~ /hits=(\d+);bytes=(\d+);duration=([\-\d]+);first=([^;]*);last=([^;]*);url=(.*?);cache_hit=(\d*);cache_bytes=(\d*)/) {
my $url = $6;
$url_stat{$url}{hits} = $1;
$url_stat{$url}{bytes} = $2;
$url_stat{$url}{duration} = abs($3);
$url_stat{$url}{hits} += $1;
$url_stat{$url}{bytes} += $2;
$url_stat{$url}{duration} += abs($3);
$url_stat{$url}{firsthit} = $4 if (!$url_stat{$url}{firsthit} || ($4 < $url_stat{$url}{firsthit}));
$url_stat{$url}{lasthit} = $5 if (!$url_stat{$url}{lasthit} || ($5 > $url_stat{$url}{lasthit}));
$url_stat{$url}{cache_hit} = $7;
$url_stat{$url}{cache_bytes} = $8;
$url_stat{$url}{cache_hit} += $7;
$url_stat{$url}{cache_bytes} += $8;
if ($self->{rebuild}) {
if ($self->check_exclusions('','',$url)) {
@ -4758,9 +4758,9 @@ sub _print_top_url_stat
$total_cache_bytes += $url_stat{$url}{cache_bytes} || 0;
} elsif ($data =~ /hits=(\d+);bytes=(\d+);duration=([\-\d]+);first=([^;]*);last=([^;]*);url=(.*)/) {
my $url = $6;
$url_stat{$url}{hits} = $1;
$url_stat{$url}{bytes} = $2;
$url_stat{$url}{duration} = abs($3);
$url_stat{$url}{hits} += $1;
$url_stat{$url}{bytes} += $2;
$url_stat{$url}{duration} += abs($3);
$url_stat{$url}{firsthit} = $4 if (!$url_stat{$url}{firsthit} || ($4 < $url_stat{$url}{firsthit}));
$url_stat{$url}{lasthit} = $5 if (!$url_stat{$url}{lasthit} || ($5 > $url_stat{$url}{lasthit}));
$url_stat{$url}{users}{$user}++ if ($self->{TopUrlUser} && $self->{UserReport});