[389-commits] ldap/admin

ldap/admin/src/logconv.pl | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)

New commits:
commit c476d41935397f250f6d942dc653851b82019953
Author: Mark Reynolds <mreynolds@redhat.com>
Date: Tue May 27 10:57:32 2014 -0400

Ticket 47713 - Logconv.pl with an empty access log gives lots of errors

Description: Was missing a check to see if a log file was empty,
also fixed some "experimental" warnings in perl 5.18
caused by the use of "my $_".

https://fedorahosted.org/389/ticket/47713

Reviewed by: nhosoi(Thanks!)

diff --git a/ldap/admin/src/logconv.pl b/ldap/admin/src/logconv.pl
index c835e1a..23776be 100755
--- a/ldap/admin/src/logconv.pl
+++ b/ldap/admin/src/logconv.pl
@@ -200,8 +200,8 @@ if ($sizeCount eq "all"){$sizeCount = "100000";}
# #
#######################################

-print "\nAccess Log Analyzer $logversion\n";
-print "\nCommand: logconv.pl @ARGV\n\n";
+print "Access Log Analyzer $logversion\n";
+print "Command: logconv.pl @ARGV\n";

my $rootDNBindCount = 0;
my $anonymousBindCount = 0;
@@ -415,12 +415,12 @@ my $logline;
my $totalLineCount = 0;

sub isTarArchive {
- my $_ = shift;
+ local $_ = shift;
return /\.tar$/ || /\.tar\.bz2$/ || /\.tar.gz$/ || /\.tar.xz$/ || /\.tgz$/ || /\.tbz$/ || /\.txz$/;
}

sub isCompressed {
- my $_ = shift;
+ local $_ = shift;
return /\.gz$/ || /\.bz2$/ || /\.xz$/;
}

@@ -431,6 +431,11 @@ for (my $count=0; $count < $file_count; $count++){
if($file_count > 1 && $count == 0 && $skipFirstFile == 1){
next;
}
+ if (-z $logname){
+ # access log is empty
+ print "Skipping empty access log ($logname)...\n";
+ next;
+ }
$linesProcessed = 0; $lineBlockCount = 0;
my ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$atime,$mtime,$ctime,$blksize,$blocks);
($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$cursize,
@@ -510,6 +515,11 @@ for (my $count=0; $count < $file_count; $count++){
}
}

+if ($totalLineCount eq "0"){
+ print "There was no logging to process, exiting...\n";
+ exit 1;
+}
+
print "\n\nTotal Log Lines Analysed: " . ($totalLineCount - 1) . "\n";

$allOps = $srchCount + $modCount + $addCount + $cmpCount + $delCount + $modrdnCount + $bindCount + $extopCount + $abandonCount + $vlvCount;
@@ -2582,7 +2592,7 @@ removeDataFiles
$needCleanup = 0;
}

-END { print "Cleaning up temp files . . .\n"; removeDataFiles(); print "Done\n"; }
+END { print "Cleaning up temp files...\n"; removeDataFiles(); print "Done.\n"; }

sub
getIPfromConn

--
389 commits mailing list
389-commits@lists.fedoraproject.org
https://admin.fedoraproject.org/mailman/listinfo/389-commits