Fix pgbouncer log parser to handle message: FATAL: the database system is shutting...

diff --git a/pgbadger b/pgbadger
index 2e20ec6c42b62c1a96ad1c13b3a1bd21ac80a065..10d76e7e73c55f6895e9a8e3724f1ff98590ffba 100755 (executable)
--- a/pgbadger
+++ b/pgbadger
@@ -12578,7 +12578,7 @@ sub parse_pgbouncer
 
        } elsif ($prefix_vars{'t_loglevel'} =~ $main_error_regex) {
 
-               if ($prefix_vars{'t_loglevel'} eq 'WARNING') {
+               if (($prefix_vars{'t_loglevel'} eq 'WARNING') || ($prefix_vars{'t_loglevel'} eq 'ERROR')) {
 
                        if ($prefix_vars{'t_query'} =~ /dropping database '([^']+)' as it does not exist anymore/) {
                                $prefix_vars{t_dbname} = $1;
@@ -12588,6 +12588,8 @@ sub parse_pgbouncer
                                $prefix_vars{t_dbuser} = $3;
                                $prefix_vars{t_dbclient} = $4;
                                $prefix_vars{t_session_id} = $1;
+                       } else {
+                               $prefix_vars{'t_query'} =~ s/^S: //;
                        }
 
                        # Add log level at beginning of the query and normalize it
@@ -12623,7 +12625,6 @@ sub parse_pgbouncer
                                $pgb_pool_info{$pool}{chronos}{"$cur_day_str"}{"$cur_hour_str"}{min}{$prefix_vars{t_min}}++;
                        }
 
-
                } else {
                        print STDERR "UNPARSED LOG LEVEL: $prefix_vars{'t_loglevel'} => $prefix_vars{'t_query'}\n";
                }