Fix 'resource' spelling in the code as well

[privoxy.git] / tools / privoxy-log-parser.pl

diff --git a/tools/privoxy-log-parser.pl b/tools/privoxy-log-parser.pl
index bc6f46c..aff6e53 100755 (executable)
--- a/tools/privoxy-log-parser.pl
+++ b/tools/privoxy-log-parser.pl
@@ -8,7 +8,7 @@
 #
 # http://www.fabiankeil.de/sourcecode/privoxy-log-parser/
 #
 #
 # http://www.fabiankeil.de/sourcecode/privoxy-log-parser/
 #

-# $Id: privoxy-log-parser.pl,v 1.119 2011/06/23 14:02:28 fabiankeil Exp $
+# $Id: privoxy-log-parser.pl,v 1.125 2011/12/31 14:53:47 fabiankeil Exp $

 #
 # TODO:
 #       - LOG_LEVEL_CGI, LOG_LEVEL_ERROR, LOG_LEVEL_WRITE content highlighting
 #
 # TODO:
 #       - LOG_LEVEL_CGI, LOG_LEVEL_ERROR, LOG_LEVEL_WRITE content highlighting


@@ -1197,9 +1197,10 @@ sub handle_loglevel_re_filter ($) {
 
     } elsif ($c =~ m/^Compressed content from /) {
 
 
     } elsif ($c =~ m/^Compressed content from /) {
 

-        # Compressed content from 29258 to 8630 bytes.
+        # Compressed content from 29258 to 8630 bytes. Compression level: 3

         $content =~ s@(?<=from )(\d+)@$h{'Number'}$1$h{'Standard'}@;
         $content =~ s@(?<=to )(\d+)@$h{'Number'}$1$h{'Standard'}@;
         $content =~ s@(?<=from )(\d+)@$h{'Number'}$1$h{'Standard'}@;
         $content =~ s@(?<=to )(\d+)@$h{'Number'}$1$h{'Standard'}@;

+        $content =~ s@(?<=level: )(\d+)@$h{'Number'}$1$h{'Standard'}@;

 
     } elsif ($c =~ m/^Reading in filter/) {
 
 
     } elsif ($c =~ m/^Reading in filter/) {
 


@@ -1266,6 +1267,11 @@ sub handle_loglevel_redirect ($) {
         # XXX: assume the same?
         $c = highlight_matched_url($c, '(?<=assuming that \")[^"]*');
 
         # XXX: assume the same?
         $c = highlight_matched_url($c, '(?<=assuming that \")[^"]*');
 

+    } elsif ($c =~ m/^Percent-encoding redirect/) {
+
+        # Percent-encoding redirect URL: http://www.example.org/\x02
+        $c = highlight_matched_url($c, '(?<=redirect URL: ).*');
+

     } else {
 
         found_unknown_content($c);
     } else {
 
         found_unknown_content($c);


@@ -1867,14 +1873,24 @@ sub handle_loglevel_error ($) {
 
     my $c = shift;
 
 
     my $c = shift;
 

-    if ($c =~ m/^Empty server or forwarder response received on socket \d+./) {
+    if ($c =~ m/^(?:Empty|No) server or forwarder response received on socket \d+\./) {

 
         # Empty server or forwarder response received on socket 4.
         # Empty server or forwarder response received on socket 3. \
         #  Closing client socket 15 without sending data.
 
         # Empty server or forwarder response received on socket 4.
         # Empty server or forwarder response received on socket 3. \
         #  Closing client socket 15 without sending data.

+        # Used by Privoxy 3.0.18 and later:
+        # No server or forwarder response received on socket 8. \
+        #  Closing client socket 10 without sending data.
+

         $c =~ s@(?<=on socket )(\d+)@$h{'Number'}$1$h{'Standard'}@;
         $c =~ s@(?<=client socket )(\d+)@$h{'Number'}$1$h{'Standard'}@;
         $c =~ s@(?<=on socket )(\d+)@$h{'Number'}$1$h{'Standard'}@;
         $c =~ s@(?<=client socket )(\d+)@$h{'Number'}$1$h{'Standard'}@;

+
+    } elsif ($c =~ m/^Didn't receive data in time:/) {
+
+        # Didn't receive data in time: a.fsdn.com:443
+        $c =~ s@(?<=in time: )(.*)@$h{'destination'}$1$h{'Standard'}@;

     }
     }

+

     # XXX: There are probably more messages that deserve highlighting.
 
     return $c;
     # XXX: There are probably more messages that deserve highlighting.
 
     return $c;


@@ -1981,7 +1997,7 @@ sub gather_loglevel_header_stats ($$) {
 
         # scan: HTTP/1.1 200 OK
         $stats{'method'}{$2}++;
 
         # scan: HTTP/1.1 200 OK
         $stats{'method'}{$2}++;

-        $stats{'ressource'}{$3}++;
+        $stats{'resource'}{$3}++;

         $stats{'http-version'}{$4}++;
 
     } elsif ($c =~ m/^scan: Host: ([^\s]+)/) {
         $stats{'http-version'}{$4}++;
 
     } elsif ($c =~ m/^scan: Host: ([^\s]+)/) {


@@ -2071,12 +2087,12 @@ sub print_stats () {
         print "URL statistics are disabled. Increase --url-statistics-threshold to enable them.\n";
     } else {
         print "Requested URLs:\n";
         print "URL statistics are disabled. Increase --url-statistics-threshold to enable them.\n";
     } else {
         print "Requested URLs:\n";

-        foreach my $ressource (sort {$stats{'ressource'}{$b} <=> $stats{'ressource'}{$a}} keys %{$stats{'ressource'}}) {
-            if ($stats{'ressource'}{$ressource} < $cli_options{'url-statistics-threshold'}) {
+        foreach my $resource (sort {$stats{'resource'}{$b} <=> $stats{'resource'}{$a}} keys %{$stats{'resource'}}) {
+            if ($stats{'resource'}{$resource} < $cli_options{'url-statistics-threshold'}) {

                 print "Skipped statistics for URLs below the treshold.\n";
                 last;
             }
                 print "Skipped statistics for URLs below the treshold.\n";
                 last;
             }

-            printf "%d : %s\n", $stats{'ressource'}{$ressource}, $ressource;
+            printf "%d : %s\n", $stats{'resource'}{$resource}, $resource;

         }
     }
 
         }
     }
 


@@ -2502,7 +2518,7 @@ Only fixes some breakage, but may be good enough or at least better than nothing
 Doesn't do anything else, so you probably want to pipe the output into
 B<privoxy-log-parser> again.
 
 Doesn't do anything else, so you probably want to pipe the output into
 B<privoxy-log-parser> again.
 

-[B<--url-statistics-threshold>] Only show the request count for a ressource
+[B<--url-statistics-threshold>] Only show the request count for a resource

 if it's above or equal to the given threshold. If the threshold is 0, URL
 statistics are disabled.
 
 if it's above or equal to the given threshold. If the threshold is 0, URL
 statistics are disabled.