]> granicus.if.org Git - pgbadger/commitdiff
Fix orphan lines wrongly associated to previous queries instead of temporary file...
authorDarold Gilles <gilles@darold.net>
Wed, 26 Jun 2013 14:47:50 +0000 (16:47 +0200)
committerDarold Gilles <gilles@darold.net>
Wed, 26 Jun 2013 14:47:50 +0000 (16:47 +0200)
pgbadger

index 93b0afb2d1af0d64c2a0cc492f712a646543e8c3..2fb9548e15cd99713ff461d7e944b1a7f1757f91 100755 (executable)
--- a/pgbadger
+++ b/pgbadger
@@ -1294,7 +1294,11 @@ sub process_file
                                                $cur_info{$cur_pid}{parameters} .= " $t_query";
                                                next;
                                        } 
-                                       if ($cur_info{$cur_pid}{statement}) {
+                                       if (exists $cur_temp_info{$cur_pid}{query}) {
+                                               $cur_temp_info{$cur_pid}{query} .= "\n" . $line;
+                                       } elsif (exists $cur_lock_info{$cur_pid}{query}) {
+                                               $cur_lock_info{$cur_pid}{query} .= "\n" . $line;
+                                       } elsif ($cur_info{$cur_pid}{statement}) {
                                                $cur_info{$cur_pid}{statement} .= "\n" . $t_query;
                                        } elsif ($cur_info{$cur_pid}{context}) {
                                                $cur_info{$cur_pid}{context} .= "\n" . $t_query;
@@ -1307,7 +1311,11 @@ sub process_file
                                        # Collect orphans lines of multiline queries
                                } elsif ($cur_pid && ($line !~ $orphan_syslog_line)) {
 
-                                       if ($cur_info{$cur_pid}{statement}) {
+                                       if (exists $cur_temp_info{$cur_pid}{query}) {
+                                               $cur_temp_info{$cur_pid}{query} .= "\n" . $line;
+                                       } elsif (exists $cur_lock_info{$cur_pid}{query}) {
+                                               $cur_lock_info{$cur_pid}{query} .= "\n" . $line;
+                                       } elsif ($cur_info{$cur_pid}{statement}) {
                                                $cur_info{$cur_pid}{statement} .= "\n" . $line;
                                        } elsif ($cur_info{$cur_pid}{context}) {
                                                $cur_info{$cur_pid}{context} .= "\n" . $line;
@@ -1386,7 +1394,11 @@ sub process_file
                                                $cur_info{$cur_pid}{parameters} .= " $line";
                                                next;
                                        } 
-                                       if (exists $cur_info{$cur_pid}{statement}) {
+                                       if (exists $cur_temp_info{$cur_pid}{query}) {
+                                               $cur_temp_info{$cur_pid}{query} .= "\n" . $line;
+                                       } elsif (exists $cur_lock_info{$cur_pid}{query}) {
+                                               $cur_lock_info{$cur_pid}{query} .= "\n" . $line;
+                                       } elsif (exists $cur_info{$cur_pid}{statement}) {
                                                $cur_info{$cur_pid}{statement} .= "\n" . $line;
                                        } elsif (exists $cur_info{$cur_pid}{context}) {
                                                $cur_info{$cur_pid}{context} .= "\n" . $line;