projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow metrics.torproject.org
[privoxy.git]
/
tools
/
privoxy-log-parser.pl
diff --git
a/tools/privoxy-log-parser.pl
b/tools/privoxy-log-parser.pl
index
c6b52b8
..
12f8af8
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.
73 2010/01/05 23:36:43 fabiankeil
Exp $
+# $Id: privoxy-log-parser.pl,v 1.
228 2010/02/13 15:25:10 fk
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
@@
-1744,7
+1744,8
@@
sub handle_loglevel_info ($) {
$c =~ m/^Malformerd HTTP headers detected and MS IIS5 hack enabled/ or
$c =~ m/^Invalid \"chunked\" transfer/ or
$c =~ m/^Support for/ or
$c =~ m/^Malformerd HTTP headers detected and MS IIS5 hack enabled/ or
$c =~ m/^Invalid \"chunked\" transfer/ or
$c =~ m/^Support for/ or
- $c =~ m/^Flushing header and buffers/
+ $c =~ m/^Flushing header and buffers/ or
+ $c =~ m/^Can not resolve/
) {
# No logfile configured. Please enable it before reporting any problems.
) {
# No logfile configured. Please enable it before reporting any problems.
@@
-1755,6
+1756,7
@@
sub handle_loglevel_info ($) {
# Support for 'Connection: keep-alive' is experimental, incomplete and\
# known not to work properly in some situations.
# Flushing header and buffers. Stepping back from filtering.
# Support for 'Connection: keep-alive' is experimental, incomplete and\
# known not to work properly in some situations.
# Flushing header and buffers. Stepping back from filtering.
+ # Can not resolve doesnotexist: hostname nor servname provided, or not known
} else {
} else {
@@
-1872,8
+1874,7
@@
sub gather_loglevel_error_stats ($$) {
sub gather_loglevel_connect_stats ($$) {
sub gather_loglevel_connect_stats ($$) {
- my $c = shift;
- my $thread = shift;
+ my ($c, $thread) = @_;
our %thread_data;
our %stats;
our %thread_data;
our %stats;
@@
-1905,10
+1906,9
@@
sub gather_loglevel_connect_stats ($$) {
}
}
}
}
-sub gather_loglevel_header_stats ($) {
+sub gather_loglevel_header_stats ($
$
) {
- my $c = shift;
- my $thread = shift;
+ my ($c, $thread) = @_;
our %stats;
if ($c =~ m/^A HTTP\/1\.1 response without/ or
our %stats;
if ($c =~ m/^A HTTP\/1\.1 response without/ or
@@
-2125,7
+2125,7
@@
sub parse_loop () {
sub stats_loop () {
sub stats_loop () {
- my ($day, $time_stamp, $
thread, $log_level, $content, $c, $msecs
);
+ my ($day, $time_stamp, $
msecs, $thread, $log_level, $content
);
my %log_level_handlers = (
'Re-Filter' => \&handle_loglevel_ignore,
'Header' => \&gather_loglevel_header_stats,
my %log_level_handlers = (
'Re-Filter' => \&handle_loglevel_ignore,
'Header' => \&gather_loglevel_header_stats,
@@
-2148,9
+2148,9
@@
sub stats_loop () {
$day = $1;
$time_stamp = $2;
$msecs = $3 ? $3 : 0;
$day = $1;
$time_stamp = $2;
$msecs = $3 ? $3 : 0;
- $log_level = $5;
- $content = $c = $6;
$thread = $4;
$thread = $4;
+ $log_level = $5;
+ $content = $6;
if (defined($log_level_handlers{$log_level})) {
if (defined($log_level_handlers{$log_level})) {
@@
-2307,7
+2307,7
@@
that didn't modify the content.
[B<--statistics>] Gather various statistics instead of syntax highlighting
log messages. This is an experimental feature, if the results look wrong
[B<--statistics>] Gather various statistics instead of syntax highlighting
log messages. This is an experimental feature, if the results look wrong
-they very well might be. Also note that the results a pretty much guaranteed
+they very well might be. Also note that the results a
re
pretty much guaranteed
to be incorrect if Privoxy and Privoxy-Log-Parser aren't in sync.
[B<--version>] Print version and exit.
to be incorrect if Privoxy and Privoxy-Log-Parser aren't in sync.
[B<--version>] Print version and exit.