packages: nagios-plugin-check_mysql_replication/nagios-plugin-check_mysql_r...

[glen]

Author: glen                         Date: Tue Sep  8 11:15:21 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- report connect error details in status

---- Files affected:
packages/nagios-plugin-check_mysql_replication:
   nagios-plugin-check_mysql_replication.spec (1.12 -> 1.13) , report-errors.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/nagios-plugin-check_mysql_replication/nagios-plugin-check_mysql_replication.spec
diff -u packages/nagios-plugin-check_mysql_replication/nagios-plugin-check_mysql_replication.spec:1.12 packages/nagios-plugin-check_mysql_replication/nagios-plugin-check_mysql_replication.spec:1.13
--- packages/nagios-plugin-check_mysql_replication/nagios-plugin-check_mysql_replication.spec:1.12	Tue Sep  8 11:22:16 2009
+++ packages/nagios-plugin-check_mysql_replication/nagios-plugin-check_mysql_replication.spec	Tue Sep  8 13:15:15 2009
@@ -5,13 +5,14 @@
 Summary(pl.UTF-8):	Wtyczka Nagiosa do sprawdzania replikacji między instancjami bazy danych MySQL
 Name:		nagios-plugin-%{plugin}
 Version:	0.03
-Release:	4
+Release:	5
 License:	Opensource
 Group:		Networking
 Source0:	http://www.james.rcpt.to/svn/trunk/nagios/check_mysql_replication/check_mysql_replication.pl
 # Source0-md5:	af8da7807e1a03bf301fa70658fb08c3
 Source1:	%{plugin}.cfg
 Patch0:		%{name}-defaultpass.patch
+Patch1:		report-errors.patch
 URL:		http://www.james.rcpt.to/svn/trunk/nagios/check_mysql_replication/
 BuildRequires:	rpm-perlprov >= 4.1-13
 Requires:	nagios-core
@@ -36,6 +37,7 @@
 %setup -q -c -T
 cp -a %{SOURCE0} %{plugin}
 %patch0 -p1
+%patch1 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -57,6 +59,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2009/09/08 11:15:15  glen
+- report connect error details in status
+
 Revision 1.12  2009/09/08 09:22:16  glen
 - add more generic config; rel 4
 

================================================================
Index: packages/nagios-plugin-check_mysql_replication/report-errors.patch
diff -u /dev/null packages/nagios-plugin-check_mysql_replication/report-errors.patch:1.1
--- /dev/null	Tue Sep  8 13:15:21 2009
+++ packages/nagios-plugin-check_mysql_replication/report-errors.patch	Tue Sep  8 13:15:15 2009
@@ -0,0 +1,36 @@
+--- ./check_mysql_replication	2006-08-30 01:15:04.000000000 +0300
++++ ./check_mysql_replication	2009-09-08 14:03:17.000000000 +0300
+@@ -125,13 +125,13 @@
+ 	debug(1, "Connecting to slave $host:$port as user " . $options->{'slave-user'});
+ 	my $dbh = DBI->connect("DBI:mysql:host=$host:port=$port", $options->{'slave-user'}, $options->{'slave-pass'});
+ 	if (not $dbh) {
+-		print "UNKNOWN: cannot connect to $host\n";
++		print "UNKNOWN: Cannot connect to $host: $DBI::errstr\n";
+ 		exit 3;
+ 	}
+ 	my $sql = "show variables";
+ 	my $sth = $dbh->prepare($sql);
+ 	if (not $sth) {
+-		print "UNKNOWN: cannot prepare $sql\n";
++		print "UNKNOWN: Cannot prepare $sql\n";
+ 		exit 3;
+ 	}
+ 	debug(2, "Getting slave variables");
+@@ -144,7 +144,7 @@
+ 	$sql = "show slave status";
+ 	$sth = $dbh->prepare($sql);
+ 	if (not $sth) {
+-		print "UNKNOWN: cannot prepare $sql\n";
++		print "UNKNOWN: Cannot prepare $sql\n";
+ 		exit 3;
+ 	}
+ 	debug(2, "Getting slave replication status");
+@@ -182,7 +182,7 @@
+ 	$dbh = DBI->connect("DBI:mysql:host=$host:port=$port", $user, $pass);
+ 
+ 	if (not $dbh) {
+-		print "UNKNOWN: Cannot connect to master $host:$port\n";
++		print "UNKNOWN: Cannot connect to master $host:$port: $DBI::errstr\n";
+ 		exit 3;
+ 	}
+ 	$sql = "show variables";
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios-plugin-check_mysql_replication/nagios-plugin-check_mysql_replication.spec?r1=1.12&r2=1.13&f=u