tyler.durden/squidanalyzer
1
0
Fork 0
mirror of https://github.com/darold/squidanalyzer.git synced 2025-08-29 05:48:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add --with-month-stat command line to force compute month statistics when --no-year-stat is used.

Browse Source
This commit is contained in:
Darold Gilles 2017-08-06 12:21:42 +02:00
parent 75c88fc270
commit 58bdeda870
4 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README
View File

@ -180,6 +180,7 @@ USAGE
--no-year-stat : disable years statistics, reports will start
from month level only.
--no-week-stat : disable weekly statistics.
--with-month-stat : enable month stats when --no-year-stat is used.
Log files to parse can be given as command line arguments or as a comma
separated list of file for the LogFile configuration directive. By

24
SquidAnalyzer.pm
View File

@ -1568,6 +1568,7 @@ sub _init
$self->{Locale} = $options{Locale} || '';
$self->{TopUrlUser} = $options{TopUrlUser} || 0;
$self->{no_year_stat} = 0;
$self->{with_month_stat} = 0;
$self->{no_week_stat} = 0;
$self->{UseClientDNSName} = $options{UseClientDNSName} || 0;
$self->{DNSLookupTimeout} = $options{DNSLookupTimeout} || 0.0001;
@ -2187,7 +2188,10 @@ sub _append_stat
$dat_file_code->close();
#### With huge log file we only store global statistics in year and month views
return if ( $self->{no_year_stat} && ($type ne 'hour') );
if ( $self->{no_year_stat} && ($type ne 'hour') ) {
# unless month view is explicitly wanted
return if (!$self->{with_month_stat} || ($type ne 'day'));
}
#### Save url statistics per user
if ($self->{UrlReport}) {
@ -2277,7 +2281,11 @@ sub _save_stat
$dat_file_code->close();
#### With huge log file we only store global statistics in year and month views
return if ( $self->{no_year_stat} && (($type ne 'hour') && !$wn) );
if ( $self->{no_year_stat} && (($type ne 'hour') && !$wn) ) {
print STDERR "UUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUU $self->{with_month_stat} || ($type ne 'day') ==> ($type ne 'hour') && !$wn)\n";
# unless month view is explicitly wanted
return if (!$self->{with_month_stat} || ($type ne 'day'));
}
#### Save url statistics per user
if ($self->{UrlReport}) {
@ -2572,7 +2580,10 @@ sub _read_stat
}
#### With huge log file we only store global statistics in year and month views
return if ($self->{no_year_stat} && ($type ne 'hour'));
if ( $self->{no_year_stat} && ($type ne 'hour') ) {
# unless month view is explicitly wanted
return if (!$self->{with_month_stat} || ($type ne 'day'));
}
#### Read previous client statistics
if (!$kind || ($kind eq 'stat_user')) {
@ -3377,7 +3388,7 @@ sub gen_html_output
}
#### With huge log file we do not store detail statistics
if ( !$self->{no_year_stat} || ($self->{no_year_stat} && ($day || $week)) ) {
if ( (!$self->{no_year_stat} || $self->{with_month_stat}) || ($self->{no_year_stat} && ($day || $week)) ) {
if ($self->{queue_size} <= 1) {
if ($self->{UserReport}) {
$self->_print_user_stat($dir, $year, $month, $day, $week);
@ -3520,13 +3531,12 @@ sub _print_cache_stat
# Print the HTML header
my $cal = 'SA_CALENDAR_SA';
$cal = '' if ($week);
if ( !$self->{no_year_stat} || ($type ne 'month') ) {
if ( (!$self->{no_year_stat} || $self->{with_month_stat}) || ($type ne 'month') ) {
$self->_print_header(\$out, $self->{menu}, $cal);
print $out $self->_print_title($Translate{'Cache_title'}, $stat_date, $week);
} else {
$self->_print_header(\$out, $self->{menu3}, $cal);
print $out $self->_print_title($Translate{'Cache_title'}, $stat_date, $week);
}
print $out $self->_print_title($Translate{'Cache_title'}, $stat_date, $week);
my $total_cost = sprintf("%2.2f", int(($code_stat{HIT}{bytes} + $code_stat{MISS}{bytes})/1000000) * $self->{CostPrice});
my $comma_bytes = $self->format_bytes($total_bytes);

1
doc/SquidAnalyzer.pod
View File

@ -184,6 +184,7 @@ Usage: squid-analyzer [ -c squidanalyzer.conf ] [logfile(s)]
--no-year-stat : disable years statistics, reports will start
from month level only.
--no-week-stat : disable weekly statistics.
--with-month-stat : enable month stats when --no-year-stat is used.
Log files to parse can be given as command line arguments or as a comma separated
list of file for the LogFile configuration directive. By default SquidAnalyer will

4
squid-analyzer
View File

@ -26,6 +26,7 @@ my $pidfile = 'squid-analyzer.pid';
my $queue_size = 0;
my $timezone = '';
my $no_year_stat = 0;
my $with_month_stat = 0;
my $no_week_stat = 0;
my $t0 = Benchmark->new;
my $start_time = '';
@ -48,6 +49,7 @@ my $result = GetOptions (
"v|version!" => \$version,
"no-year-stat!" => \$no_year_stat,
"no-week-stat!" => \$no_week_stat,
"with-month-stat!" => \$with_month_stat,
);
# Show warning for obsolete options
@ -105,6 +107,7 @@ unlink("$pid_dir/last_parsed.tmp");
# Instanciate SquidAnalyzer.pm perl module
my $sa = new SquidAnalyzer($configfile, join(',', @logfile), $debug, $rebuild, $pid_dir, $pidfile, $timezone);
$sa->{no_year_stat} = $no_year_stat;
$sa->{with_month_stat} = $with_month_stat;
$sa->{no_week_stat} = $no_week_stat;
$sa->{queue_size} = $queue_size;
$sa->{TimeStart} = $start_time;
@ -218,6 +221,7 @@ Usage: squid-analyzer [ -c squidanalyzer.conf ] [logfile(s)]
--no-year-stat : disable years statistics, reports will start
from month level only.
--no-week-stat : disable weekly statistics.
--with-month-stat : enable month stats when --no-year-stat is used.
Log files to parse can be given as command line arguments or as a comma separated
list of file for the LogFile configuration directive. By default SquidAnalyer will