[check_postgres] [commit] Fix for old versions of File::Temp by Chris Butler

[check_postgres at bucardo.org]

Committed by Greg Sabino Mullane <greg at endpoint.com>

Fix for old versions of File::Temp by Chris Butler

---
 check_postgres.pl      |   13 +++++++++----
 check_postgres.pl.asc  |    6 +++---
 check_postgres.pl.html |    9 ++++++++-
 index.html             |    8 ++++----
 4 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/check_postgres.pl b/check_postgres.pl
index 0944837..5044cd9 100755
--- a/check_postgres.pl
+++ b/check_postgres.pl
@@ -28,7 +28,7 @@ $Data::Dumper::Varname = 'POSTGRES';
 $Data::Dumper::Indent = 2;
 $Data::Dumper::Useqq = 1;
 
-our $VERSION = '2.4.1';
+our $VERSION = '2.4.2';
 
 use vars qw/ %opt $PSQL $res $COM $SQL $db /;
 
@@ -303,7 +303,7 @@ if ($opt{showtime}) {
 
 ## We don't (usually) want to die, but want a graceful Nagios-like exit instead
 sub ndie {
-	File::Temp::cleanup();
+	eval { File::Temp::cleanup(); };
 	my $msg = shift;
 	chomp $msg;
 	print "ERROR: $msg\n";
@@ -1139,7 +1139,7 @@ sub run_command {
 	close $errfh or ndie qq{Could not close $errorfile: $!\n};
 	close $tempfh or ndie qq{Could not close $tempfile: $!\n};
 
-	File::Temp::cleanup();
+	eval { File::Temp::cleanup(); };
 
 	$info->{hosts} = keys %host;
 
@@ -3725,7 +3725,7 @@ sub show_dbstats {
 =head1 NAME
 
 B<check_postgres.pl> - a Postgres monitoring script for Nagios, MRTG, Cacti, and others
-This documents describes check_postgres.pl version 2.4.1
+This documents describes check_postgres.pl version 2.4.2
 
 =head1 SYNOPSIS
 
@@ -4942,6 +4942,11 @@ Items not specifically attributed are by Greg Sabino Mullane.
 
 =over 4
 
+=item B<Version 2.4.2>
+
+  Wrap File::Temp::cleanup() calls in eval, in case File::Temp is an older version.
+  Patch by Chris Butler.
+
 =item B<Version 2.4.1>
 
   Cast numbers to numeric to support sequences ranges > bigint in check_sequence action.
diff --git a/check_postgres.pl.asc b/check_postgres.pl.asc
index 4089a42..1523cb7 100644
--- a/check_postgres.pl.asc
+++ b/check_postgres.pl.asc
@@ -1,6 +1,6 @@
 -----BEGIN PGP SIGNATURE-----
 
-iEYEABEDAAYFAkkR4C4ACgkQvJuQZxSWSshcOACfeVZ8AWBfSRQIORPd5pL51TUr
-fGwAoOmcRxDE7BQ+IwoAwc/2OV47ea96
-=eLTc
+iEYEABEDAAYFAkkTN9gACgkQvJuQZxSWSsjxVQCg6dc8cZc6axb7dfrDHaZe9eDt
+HyMAoIK731LqETVlsqI59ANroNyKNid+
+=U6xS
 -----END PGP SIGNATURE-----
diff --git a/check_postgres.pl.html b/check_postgres.pl.html
index d3cec38..5fa7da7 100644
--- a/check_postgres.pl.html
+++ b/check_postgres.pl.html
@@ -92,7 +92,7 @@
 <hr />
 <h1><a name="name">NAME</a></h1>
 <p><strong>check_postgres.pl</strong> - a Postgres monitoring script for Nagios, MRTG, Cacti, and others
-This documents describes check_postgres.pl version 2.4.1</p>
+This documents describes check_postgres.pl version 2.4.2</p>
 <p>
 </p>
 <hr />
@@ -1203,6 +1203,13 @@ feature requests, and commit notices, send email to <a href="mailto:check_postgr
 <h1><a name="history">HISTORY</a></h1>
 <p>Items not specifically attributed are by Greg Sabino Mullane.</p>
 <dl>
+<dt><strong><a name="item_version_2_2e4_2e2"><strong>Version 2.4.2</strong></a></strong></dt>
+
+<dd>
+<pre>
+  Warp File::Temp::cleanup() call in eval, in case File::Temp is an older version.
+  Patch by Chris Butler.</pre>
+</dd>
 <dt><strong><a name="item_version_2_2e4_2e1"><strong>Version 2.4.1</strong></a></strong></dt>
 
 <dd>
diff --git a/index.html b/index.html
index ee30b96..11261fc 100644
--- a/index.html
+++ b/index.html
@@ -21,14 +21,14 @@ h1 {
 
 <h1>check_postgres.pl</h1>
 
-<p><b>check_postgres.pl</b> is a script for checking the state of one or more Postgres databases and reporting back in a Nagios-friendly manner. It was developed by Greg Sabino Mullane of <a href="http://www.endpoint.com/">End Point Corporation</a> and is BSD-licensed. The latest version is <b>2.4.1</b>, and was released on November 05, 2008.</p>
+<p><b>check_postgres.pl</b> is a script for checking the state of one or more Postgres databases and reporting back in a Nagios-friendly manner. It was developed by Greg Sabino Mullane of <a href="http://www.endpoint.com/">End Point Corporation</a> and is BSD-licensed. The latest version is <b>2.4.2</b>, and was released on November 06, 2008.</p>
 
 <ul>
- <li><a href="/check_postgres/check_postgres.pl.html">Documentation for check_postgres 2.4.1</a></li>
+ <li><a href="/check_postgres/check_postgres.pl.html">Documentation for check_postgres 2.4.2</a></li>
 </ul>
 <ul>
- <li><a href="/check_postgres/check_postgres.pl">Download check_postgres.pl 2.4.1</a></li>
- <li><a href="/check_postgres/check_postgres.pl.asc">PGP signature for check_postgres.pl 2.4.1</a></li>
+ <li><a href="/check_postgres/check_postgres.pl">Download check_postgres.pl 2.4.2</a></li>
+ <li><a href="/check_postgres/check_postgres.pl.asc">PGP signature for check_postgres.pl 2.4.2</a></li>
 </ul>
 
 <p>The latest development version can be downloaded via git:</p>
-- 
1.5.5.4