From: Darold Gilles <gilles@darold.net>
Date: Wed, 29 Aug 2012 07:58:50 +0000 (+0200)
Subject: Allow character : in log line prefix, it will no more break the log parsing. Thanks... 
X-Git-Tag: v3.2~159
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6318050f29e622e29db0f30581f25e7326845353;p=pgbadger

Allow character : in log line prefix, it will no more break the log parsing. Thanks to John Rouillard for the report
---

diff --git a/pgbadger b/pgbadger
index 60e3766..a198747 100755
--- a/pgbadger
+++ b/pgbadger
@@ -501,7 +501,7 @@ foreach my $logfile (@log_files) {
 			if ($format eq 'syslog') {
 
 				if ($line =~
-					/^(...)\s+(\d+)\s(\d+):(\d+):(\d+)\s([^\s]+)\s([^\[]+)\[(\d+)\]:\s\[([0-9\-]+)\]\s*([^:]*?)\s*([A-Z]+?):\s+(.*)/)
+					/^(...)\s+(\d+)\s(\d+):(\d+):(\d+)\s([^\s]+)\s([^\[]+)\[(\d+)\]:\s\[([0-9\-]+)\]\s*(.*?)\s*(LOG|WARNING|ERROR|FATAL|PANIC|DETAIL|STATEMENT|HINT|CONTEXT):\s+(.*)/)
 				{
 
 					# skip non postgresql lines
@@ -564,7 +564,7 @@ foreach my $logfile (@log_files) {
 
 				# Parse stderr lines
 				if ($line =~
-					/(\d+)-(\d+)-(\d+)\s(\d+):(\d+):(\d+)\s([^\s]+)\s\[(\d+)\]:\s\[([0-9\-]+)\]\s*([^:]*?)\s*([A-Z]+?):\s+(.*)/)
+					/(\d+)-(\d+)-(\d+)\s(\d+):(\d+):(\d+)\s([^\s]+)\s\[(\d+)\]:\s\[([0-9\-]+)\]\s*(.*?)\s*(LOG|WARNING|ERROR|FATAL|PANIC|DETAIL|STATEMENT|HINT|CONTEXT):\s+(.*)/)
 				{
 
 					# Skip unwanted lines
@@ -3487,13 +3487,13 @@ sub autodetect_format
 		$nline++;
 
 		# Is syslog lines ?
-		if ($line =~ /^...\s+\d+\s\d+:\d+:\d+\s[^\s]+\s([^\[]+)\[\d+\]:\s\[[0-9\-]+\][^:]+:\s+$duration/) {
+		if ($line =~ /^...\s+\d+\s\d+:\d+:\d+\s[^\s]+\s([^\[]+)\[\d+\]:\s\[[0-9\-]+\](.*?)(LOG|WARNING|ERROR|FATAL|PANIC|DETAIL|STATEMENT|HINT|CONTEXT):\s+$duration/) {
 			$fmt = 'syslog';
 			$nfound++;
 			$ident_name{$1}++;
 
 			# Is stderr lines
-		} elsif ($line =~ /\d+-\d+-\d+\s\d+:\d+:\d+\s[^\s]+\s\[\d+\]:\s\[[0-9\-]+\][^:]+:\s+$duration/) {
+		} elsif ($line =~ /\d+-\d+-\d+\s\d+:\d+:\d+\s[^\s]+\s\[\d+\]:\s\[[0-9\-]+\](.*?)(LOG|WARNING|ERROR|FATAL|PANIC|DETAIL|STATEMENT|HINT|CONTEXT):\s+$duration/) {
 			$fmt = 'stderr';
 			$nfound++;
 		} elsif ($line =~ tr/,/,/ >= 12) {