From 576298131a8b2c9e4171ce16a2b3496e2f598a17 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 23 Nov 2008 15:45:45 +0000 Subject: [PATCH] Support log messages with and without "Privoxy(" and ")" around the thread id. --- tools/privoxy-log-parser.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/privoxy-log-parser.pl b/tools/privoxy-log-parser.pl index 9575ba9f..5a88c259 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.124 2008/11/22 10:02:52 fk Exp $ +# $Id: privoxy-log-parser.pl,v 1.125 2008/11/23 15:43:05 fk Exp $ # # TODO: # - LOG_LEVEL_CGI, LOG_LEVEL_ERROR, LOG_LEVEL_WRITE content highlighting @@ -1759,7 +1759,7 @@ sub parse_loop () { $output = ''; - if (m/^(\w{3} \d{2}) (\d\d:\d\d:\d\d)\.?(\d+)? (?:Privoxy\(([^\)]*)\)) ([\w -]*): (.*)$/) { + if (m/^(\w{3} \d{2}) (\d\d:\d\d:\d\d)\.?(\d+)? (?:Privoxy\()?([^\)\s]*)[\)]? ([\w -]*): (.*)$/) { # XXX: Put in req hash? $day = $1; $time_stamp = $2; -- 2.39.2