Merge pull request bucardo#158 from solute/fix_query_time_warning_with_empty_query

turnstep · web-flow · commit f48701771745 · 2023-04-03T13:06:49.000-04:00
Fix uninitialized value warning with empty query
diff --git a/check_postgres.pl b/check_postgres.pl
@@ -9074,7 +9074,7 @@ sub check_txn_idle {
             $maxr->{client_addr} eq '' ? '' : (sprintf ' %s:%s', msg('address'), $maxr->{client_addr}),
             ($maxr->{client_port} eq '' or $maxr->{client_port} < 1)
                 ? '' : (sprintf ' %s:%s', msg('port'), $maxr->{client_port}),
-            msg('query'),  $maxr->{query} || $maxr->{current_query};
+            msg('query'),  defined($maxr->{query}) ? $maxr->{query} : $maxr->{current_query};
     }
 
     ## For MRTG, we can simply exit right now

Original file line number	Diff line number	Diff line change
`@@ -9074,7 +9074,7 @@ sub check_txn_idle {`
`9074`	`9074`	`$maxr->{client_addr} eq '' ? '' : (sprintf ' %s:%s', msg('address'), $maxr->{client_addr}),`
`9075`	`9075`	`($maxr->{client_port} eq '' or $maxr->{client_port} < 1)`
`9076`	`9076`	`? '' : (sprintf ' %s:%s', msg('port'), $maxr->{client_port}),`
`9077`		`- msg('query'), $maxr->{query} \|\| $maxr->{current_query};`
	`9077`	`+ msg('query'), defined($maxr->{query}) ? $maxr->{query} : $maxr->{current_query};`
`9078`	`9078`	`}`
`9079`	`9079`
`9080`	`9080`	`## For MRTG, we can simply exit right now`