From: Greg Sabino Mullane <greg@endpoint.com>
Date: Wed, 29 Jul 2009 03:07:39 +0000 (-0400)
Subject: Better output when hitting second database, port, or host.
X-Git-Tag: 2.10.0~13
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=1e52bc041ac27267cdaf157b27a4d4eb1bb13f6d;p=check_postgres.git

Better output when hitting second database, port, or host.
---

diff --git a/check_postgres.pl b/check_postgres.pl
index 062f0a522..7461d3ff7 100755
--- a/check_postgres.pl
+++ b/check_postgres.pl
@@ -888,11 +888,17 @@ sub add_response {
 
 	$db->{host} ||= '';
 
-	if (defined $opt{host2} and defined $opt{host2}->[0] and length $opt{host2}->[0]) {
+	if (defined $opt{dbname2} and defined $opt{dbname2}->[0] and length $opt{dbname2}->[0]
+		and $opt{dbname}->[0] ne $opt{dbname2}->[0]) {
+		$db->{dbname} .= " => $opt{dbname2}->[0]";
+	}
+	if (defined $opt{host2} and defined $opt{host2}->[0] and length $opt{host2}->[0]
+		and $opt{host}->[0] ne $opt{host2}->[0]) {
 		$db->{host} .= " => $opt{host2}->[0]";
 	}
-	if (defined $opt{port2} and defined $opt{port2}->[0] and length $opt{port2}->[0]) {
-		$db->{port} .= " => $opt{port2}->[0]";
+	if (defined $opt{port2} and defined $opt{port2}->[0] and length $opt{port2}->[0]
+		and $opt{port}->[0] ne $opt{port2}->[0]) {
+		$db->{port} .= " => $opt{port2}->[0]) ";
 	}
 	if ($nohost) {
 		push @{$type->{''}} => [$msg, length $nohost > 1 ? $nohost : ''];