From: Darold Gilles <gilles@darold.net>
Date: Thu, 6 Sep 2012 13:38:12 +0000 (+0200)
Subject: Fix false autodetection of CSV format when log_statement is enable or in possible... 
X-Git-Tag: v3.2~157
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c636e2ea56445eae690166924d31da1f23552372;p=pgbadger

Fix false autodetection of CSV format when log_statement is enable or in possible other cases. This was resulting in error: "FATAL: cannot use CSV". Thanks to Thomas Reiss for the report.
---

diff --git a/pgbadger b/pgbadger
index d8d7449..a6504d8 100755
--- a/pgbadger
+++ b/pgbadger
@@ -3498,7 +3498,7 @@ sub autodetect_format
 		} 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) {
+		} elsif ( ($line =~ /,(LOG|WARNING|ERROR|FATAL|PANIC|DETAIL|STATEMENT|HINT|CONTEXT),/) && ($line =~ tr/,/,/ >= 12) ) {
 			$fmt = 'csv';
 			$nfound++;
 		}