From 8641d55a4e4ed7abd04dfa22d6ff07e8368aa091 Mon Sep 17 00:00:00 2001 From: Daniel Nichter Date: Mon, 10 Jun 2013 20:02:32 -0700 Subject: [PATCH] Fix log entry line regex. --- bin/pt-agent | 2 +- lib/Percona/Agent/Logger.pm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/pt-agent b/bin/pt-agent index fe680c7b..d0ecafa6 100755 --- a/bin/pt-agent +++ b/bin/pt-agent @@ -4923,7 +4923,7 @@ sub start_online_logging { last QUEUE unless $lines; LINE: while ( defined(my $line = shift @$lines) ) { - my ($ts, $level, $n_lines, $msg) = $line =~ m/^([^,]+),([^,]+),(.+)/s; + my ($ts, $level, $n_lines, $msg) = $line =~ m/^([^,]+),([^,]+),([^,]+),(.+)/s; if ( !$ts || !$level || !$n_lines || !$msg ) { warn "Invalid log entry: $line\n"; next LINE; diff --git a/lib/Percona/Agent/Logger.pm b/lib/Percona/Agent/Logger.pm index bebd1523..072d314c 100644 --- a/lib/Percona/Agent/Logger.pm +++ b/lib/Percona/Agent/Logger.pm @@ -132,7 +132,7 @@ sub start_online_logging { LINE: while ( defined(my $line = shift @$lines) ) { # $line = ts,level,n_lines,message - my ($ts, $level, $n_lines, $msg) = $line =~ m/^([^,]+),([^,]+),(.+)/s; + my ($ts, $level, $n_lines, $msg) = $line =~ m/^([^,]+),([^,]+),([^,]+),(.+)/s; if ( !$ts || !$level || !$n_lines || !$msg ) { warn "Invalid log entry: $line\n"; next LINE;