From: Alexander Marx <alexander.marx@ipfire.org>
Date: Thu, 17 Dec 2015 10:31:30 +0000 (+0100)
Subject: Squid-Accounting: Bugfix & clean up data
X-Git-Tag: v2.17-core97~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=78af2f67bba5900eb97989ed271b45a74448b457;p=ipfire-2.x.git

Squid-Accounting: Bugfix & clean up data

There was a Bug in the addon so that no data was displayed because of a
typo. Additionally the computeraccounts are now filtered out of
trafficdata collection.
Only Proxy/AD/LDAP Accounts and IP adresses are collected.

Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/lfs/squid-accounting b/lfs/squid-accounting
index 2e45c24b2b..ff78d36603 100644
--- a/lfs/squid-accounting
+++ b/lfs/squid-accounting
@@ -15,7 +15,7 @@ THISAPP    = squid-accounting-$(VER)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = squid-accounting
-PAK_VER    = 8
+PAK_VER    = 9
 
 DEPS       = "perl-DBI perl-DBD-SQLite perl-File-ReadBackwards perl-PDF-API2"
 
diff --git a/src/squid-accounting/acct.pl b/src/squid-accounting/acct.pl
index 68eb63c75e..e90d06ed38 100755
--- a/src/squid-accounting/acct.pl
+++ b/src/squid-accounting/acct.pl
@@ -100,7 +100,7 @@ if (-f $proxyenabled && $proxylog eq $Lang::tr{'running'}){
 	$dbh=&ACCT::connectdb;
 	my $m=sprintf("%d",(localtime((time-3600)))[4]+1);
 	&ACCT::logger($settings{'LOG'},"month before one hour $m, now is ".($mon+1)."\n");
-	if ($m = ($mon+1) || $m == '12' && ($mon+1) == '1'){
+	if ($m < ($mon+1) || $m == '12' && ($mon+1) == '1'){
 		#Logrotate
 		my $year1=$year+1900;
 		system ("tar", "cfz", "/var/log/accounting-$m-$year1.tar.gz", "/var/log/accounting.log");
@@ -217,6 +217,7 @@ sub fill_db{
 	my $tim=time();
 	#Fill ACCT table with accounting information
 	foreach my $name (sort keys %counter){
+		next if (substr($name,-1,1) eq '$');
 		foreach my $bytes (keys %{ $counter{$name} }) {
 			$dbh->do("insert into ACCT (TIME_RUN,NAME,BYTES) values ('$tim','$name','$counter{$name}{$bytes}');");
 		}