From: Fabian Keil <fk@fabiankeil.de>
Date: Sat, 8 Nov 2008 15:34:30 +0000 (+0000)
Subject: Highlight two recently unified log messages properly.
X-Git-Tag: v_3_0_11~172
X-Git-Url: http://www.privoxy.org/gitweb/@default-cgi@/faq/%22https:/@default-cgi@show-url-info?a=commitdiff_plain;h=c4c6ba0072177143b28ce73b62ac11256026ab11;p=privoxy.git

Highlight two recently unified log messages properly.
---

diff --git a/tools/privoxy-log-parser.pl b/tools/privoxy-log-parser.pl
index d7c3dcb8..22be2396 100755
--- a/tools/privoxy-log-parser.pl
+++ b/tools/privoxy-log-parser.pl
@@ -8,7 +8,7 @@
 #
 # http://www.fabiankeil.de/sourcecode/privoxy-log-parser/
 #
-# $Id: privoxy-log-parser.pl,v 1.120 2008/11/04 17:33:28 fk Exp $
+# $Id: privoxy-log-parser.pl,v 1.122 2008/11/08 15:34:01 fk Exp $
 #
 # TODO:
 #       - LOG_LEVEL_CGI, LOG_LEVEL_ERROR, LOG_LEVEL_WRITE content highlighting
@@ -1450,17 +1450,16 @@ sub handle_loglevel_connect ($) {
 
     } elsif ($c =~ m/^Socket/) {
 
-        # Socket 18 for www.privoxy.org:80 in slot 0 is no longer usable. Closing.
         # Socket 16 already forgotten or never remembered.
         $c =~ s@(?<=Socket )(\d+)@$h{'Number'}$1$h{'Standard'}@;
-        $c = highlight_matched_host($c, '(?<=for )[^\s]+');
-        $c =~ s@(?<=in slot )(\d+)@$h{'Number'}$1$h{'Standard'}@;
 
     } elsif ($c =~ m/^The connection to/) {
 
-        # The connection to www.privoxy.org:80 in slot 0 timed out. Closing.
+        # The connection to www.privoxy.org:80 in slot 6 timed out. Closing socket 19.
+        # The connection to 10.0.0.1:80 in slot 0 is no longer usable. Closing socket 4.
         $c = highlight_matched_host($c, '(?<=connection to )[^\s]+');
         $c =~ s@(?<=in slot )(\d+)@$h{'Number'}$1$h{'Standard'}@;
+        $c =~ s@(?<=Closing socket )(\d+)@$h{'Number'}$1$h{'Standard'}@;
 
     } elsif ($c =~ m/^Initialized/) {