From mboxrd@z Thu Jan  1 00:00:00 1970
From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated.
 78af2f67bba5900eb97989ed271b45a74448b457
Date: Thu, 17 Dec 2015 12:36:03 +0100
Message-ID: <20151217113604.1726B2143E@argus.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3103499077454633313=="
List-Id: <ipfire-scm.lists.ipfire.org>

--===============3103499077454633313==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  78af2f67bba5900eb97989ed271b45a74448b457 (commit)
      from  b42a7ec1a663b356dde786cc7eeb1bb54ddcc662 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 78af2f67bba5900eb97989ed271b45a74448b457
Author: Alexander Marx <alexander.marx(a)ipfire.org>
Date:   Thu Dec 17 11:31:30 2015 +0100

    Squid-Accounting: Bugfix & clean up data
   =20
    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.
   =20
    Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 lfs/squid-accounting         | 2 +-
 src/squid-accounting/acct.pl | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

Difference in files:
diff --git a/lfs/squid-accounting b/lfs/squid-accounting
index 2e45c24..ff78d36 100644
--- a/lfs/squid-accounting
+++ b/lfs/squid-accounting
@@ -15,7 +15,7 @@ THISAPP    =3D squid-accounting-$(VER)
 DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
 TARGET     =3D $(DIR_INFO)/$(THISAPP)
 PROG       =3D squid-accounting
-PAK_VER    =3D 8
+PAK_VER    =3D 9
=20
 DEPS       =3D "perl-DBI perl-DBD-SQLite perl-File-ReadBackwards perl-PDF-AP=
I2"
=20
diff --git a/src/squid-accounting/acct.pl b/src/squid-accounting/acct.pl
index 68eb63c..e90d06e 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=3D&ACCT::connectdb;
 	my $m=3Dsprintf("%d",(localtime((time-3600)))[4]+1);
 	&ACCT::logger($settings{'LOG'},"month before one hour $m, now is ".($mon+1)=
."\n");
-	if ($m =3D ($mon+1) || $m =3D=3D '12' && ($mon+1) =3D=3D '1'){
+	if ($m < ($mon+1) || $m =3D=3D '12' && ($mon+1) =3D=3D '1'){
 		#Logrotate
 		my $year1=3D$year+1900;
 		system ("tar", "cfz", "/var/log/accounting-$m-$year1.tar.gz", "/var/log/ac=
counting.log");
@@ -217,6 +217,7 @@ sub fill_db{
 	my $tim=3Dtime();
 	#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}');");
 		}


hooks/post-receive
--
IPFire 2.x development tree

--===============3103499077454633313==--