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

Fix issue with log file provided at command line (option -l) and non existant LogFile in squidanalyzer.conf. Thanks to Kalin KOZHUHAROV for the report.

Browse Source
This commit is contained in:
Darold Gilles 2013-02-17 10:27:05 +01:00
parent e0888df14d
commit 01038d43b5
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
SquidAnalyzer.pm
View File

@ -31,7 +31,7 @@ BEGIN {
}
$ZCAT_PROG = "/bin/zcat";
$ZCAT_PROG = "/bin/zcat";
$BZCAT_PROG = "/bin/bzcat";
$RM_PROG = "/bin/rm";
@ -396,7 +396,7 @@ sub _init
$conf_file = 'squidanalyzer.conf';
}
}
my %options = &parse_config($conf_file);
my %options = &parse_config($conf_file, $log_file);
# Use squid log file given as command line parameter
$options{LogFile} = $log_file if ($log_file);
@ -2820,7 +2820,7 @@ sub _gen_summary
sub parse_config
{
my ($file) = @_;
my ($file, $log_file) = @_;
die "FATAL: no configuration file!\n" if (!-e $file);
@ -2839,7 +2839,7 @@ sub parse_config
print STDERR "Error: you must give a valid output directory. See option: Output\n";
exit 0;
}
if (!exists $opt{LogFile} || !-f $opt{LogFile}) {
if (!$log_file && (!exists $opt{LogFile} || !-f $opt{LogFile})) {
print STDERR "Error: you must give the path to the Squid log file. See option: LogFile\n";
exit 0;
}