Date: Wed, 9 Jan 2013 16:01:54 +0000 (UTC) From: Palle Girgensohn <girgen@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r310155 - in head/databases/pgbadger: . files Message-ID: <201301091601.r09G1sIX035123@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: girgen Date: Wed Jan 9 16:01:54 2013 New Revision: 310155 URL: http://svnweb.freebsd.org/changeset/ports/310155 Log: add patch to accept bzip2 log files Added: head/databases/pgbadger/files/ head/databases/pgbadger/files/patch-bzip-size (contents, props changed) Modified: head/databases/pgbadger/Makefile Modified: head/databases/pgbadger/Makefile ============================================================================== --- head/databases/pgbadger/Makefile Wed Jan 9 15:55:19 2013 (r310154) +++ head/databases/pgbadger/Makefile Wed Jan 9 16:01:54 2013 (r310155) @@ -3,6 +3,7 @@ PORTNAME= pgbadger PORTVERSION= 2.2 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= http://cloud.github.com/downloads/dalibo/pgbadger/ DISTFILES= ${DISTNAME}-1${EXTRACT_SUFX} Added: head/databases/pgbadger/files/patch-bzip-size ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/pgbadger/files/patch-bzip-size Wed Jan 9 16:01:54 2013 (r310155) @@ -0,0 +1,49 @@ +--- /usr/local/bin/pgbadger 2013-01-09 16:38:48.000000000 +0100 ++++ pgbadger 2013-01-09 16:42:11.000000000 +0100 +@@ -51,6 +51,7 @@ + my $bzcat = 'bunzip2 -c'; + my $ucat = 'unzip -p'; + my $uncompress_size = "gunzip -l %f | grep -E '^\\s*[0-9]+' | awk '{print \$2}'"; ++my $uncompress_size_bz2 = "$bzcat %f | wc -c"; + my $format = ''; + my $outfile = ''; + my $outdir = ''; +@@ -536,8 +537,10 @@ + open($io, "<", $logfile) or die "FATAL: cannot read csvlog file $logfile. $!\n"; + } else { + my $uncompress = $zcat; ++ my $cmd_file_size = $uncompress_size; + if (($logfile =~ /\.bz2/i) && ($zcat =~ /^zcat$/)) { + $uncompress = $bzcat; ++ $cmd_file_size = $uncompress_size_bz2; + } elsif (($logfile =~ /\.zip/i) && ($zcat =~ /^zcat$/)) { + $uncompress = $ucat; + } +@@ -545,7 +548,7 @@ + open($io, "$uncompress $logfile |") or die "FATAL: cannot open pipe to $uncompress $logfile. $!\n"; + + # Real size of the file is unknow, try to find it +- my $cmd_file_size = $uncompress_size; ++ &logmsg("INFO", "$cmd_file_size"); + $cmd_file_size =~ s/\%f/$logfile/g; + $totalsize = `$cmd_file_size`; + chomp($totalsize); +@@ -646,8 +649,10 @@ + } else { + + my $uncompress = $zcat; ++ my $cmd_file_size = $uncompress_size; + if (($logfile =~ /\.bz2/i) && ($zcat =~ /^zcat$/)) { + $uncompress = $bzcat; ++ $cmd_file_size = $uncompress_size_bz2; + } elsif (($logfile =~ /\.zip/i) && ($zcat =~ /^zcat$/)) { + $uncompress = $ucat; + } +@@ -657,7 +662,6 @@ + $lfile->open("$uncompress $logfile |") || die "FATAL: cannot read from pipe to $uncompress $logfile. $!\n"; + + # Real size of the file is unknow, try to find it +- my $cmd_file_size = $uncompress_size; + $cmd_file_size =~ s/\%f/$logfile/g; + $totalsize = `$cmd_file_size`; + chomp($totalsize);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301091601.r09G1sIX035123>