Hi all,

The patch worked for me and solves the problem with the new log format.

Cheers.



--- apt-cacher-report.pl.original       2009-08-22 04:10:49.728107637 +0200
+++ apt-cacher-report.pl        2009-08-22 04:28:11.788093332 +0200
@@ -109,12 +109,32 @@
 {
        #$logfile_line =~ s/ /\+/g;
        @line = split /\|/, $logfile_line;
-       $req_date = $line[0];
-#      $req_ip   = $line[1];
-       $req_result = $line[2];
-       $req_bytes  = 0;
-       $req_bytes  = $line[3] if $line[3] =~ /^[0-9]+$/;
-#      $req_object = $line[4];
+
+       #
+       # BEGIN: fix BTS #525932
+       # Check log format to determine if it's 5 or 6 columns long
+       #
+        if (scalar(@line) == 5)
+        {
+                # Assume 5 columns format (OLD FORMAT)
+                $req_date = $line[0];
+               #$req_ip   = $line[1];
+                $req_result = $line[2];
+                $req_bytes  = 0;
+                $req_bytes  = $line[3] if $line[3] =~ /^[0-9]+$/;
+               #$req_object = $line[4];
+        } else {
+                # Assume 6 columns format (NEW FORMAT)
+                $req_date = $line[0];
+               #$req_ip   = $line[2];
+                $req_result = $line[3];
+                $req_bytes  = 0;
+                $req_bytes  = $line[4] if $line[4] =~ /^[0-9]+$/;
+               #$req_object = $line[5];
+        }
+       #
+       # END: fix BTS #525932
+       #


-- 
 Dario Minnucci (midget) <[email protected]>
 Phone: +34 902021030 | Fax: +34 902024417 | Support: +34 807450000
 Key fingerprint = 62FF F60F CE79 9CE4 EBA8  523F FC84 1B2D 82C8 B711


Attachment: signature.asc
Description: OpenPGP digital signature

Reply via email to