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, master has been updated via a786b755eb828726c8db333b00865432933bcf24 (commit) from 7d55ca0da4ed4d491885b0ad15a6c80244543323 (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 a786b755eb828726c8db333b00865432933bcf24 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Jul 19 14:06:47 2012 +0200

calamaris: Make decompressing large logs more memory-friendly.

Thanks to Roger Devaux for reporting and testing.

Calamaris is now able to process big log files consuming about 10M or RAM (was several gigabytes before).

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

Summary of changes: config/calamaris/mkreport | 4 ++-- config/rootfiles/core/61/filelists/files | 1 + 2 files changed, 3 insertions(+), 2 deletions(-)

Difference in files: diff --git a/config/calamaris/mkreport b/config/calamaris/mkreport index 53db9d5..ee83162 100644 --- a/config/calamaris/mkreport +++ b/config/calamaris/mkreport @@ -94,7 +94,7 @@ sub processlogfiles { if ($filestr =~ /access.log/) { open (LOG,"gzip -dc $filestr |"); - foreach (<LOG>) { + while (<LOG>) { if (substr($_,0,10) >= $date_from) { if (substr($_,0,10) <= $date_to) { print TMPLOG "$_"; } } } close(LOG); @@ -106,7 +106,7 @@ sub processlogfiles { if ($filestr =~ /access.log/) { open (LOG,$filestr); - foreach (<LOG>) { + while (<LOG>) { if (substr($_,0,10) >= $date_from) { if (substr($_,0,10) <= $date_to) { print TMPLOG "$_"; } } } close(LOG); diff --git a/config/rootfiles/core/61/filelists/files b/config/rootfiles/core/61/filelists/files index 396a27f..1466fef 100644 --- a/config/rootfiles/core/61/filelists/files +++ b/config/rootfiles/core/61/filelists/files @@ -8,5 +8,6 @@ srv/web/ipfire/cgi-bin/ovpnmain.cgi srv/web/ipfire/cgi-bin/proxy.cgi var/ipfire/general-functions.pl var/ipfire/langs +var/ipfire/proxy/calamaris/bin/mkreport usr/local/bin/getconntracktable usr/sbin/redirect_wrapper

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