Author: glen Date: Mon Mar 1 15:24:08 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- remove redundant die, capture die from child
---- Files affected:
packages/nagios-plugin-check_asterisk_skype:
check_asterisk_skype (1.2 -> 1.3)
---- Diffs:
================================================================
Index: packages/nagios-plugin-check_asterisk_skype/check_asterisk_skype
diff -u packages/nagios-plugin-check_asterisk_skype/check_asterisk_skype:1.2
packages/nagios-plugin-check_asterisk_skype/check_asterisk_skype:1.3
--- packages/nagios-plugin-check_asterisk_skype/check_asterisk_skype:1.2
Mon Mar 1 16:14:49 2010
+++ packages/nagios-plugin-check_asterisk_skype/check_asterisk_skype Mon Mar
1 16:24:03 2010
@@ -32,8 +32,8 @@
# child
# redirect stderr
open STDERR, '>&STDOUT';
- exec('asterisk', '-rx', 'skype show licenses') or die $!;
- die("could not execute asterisk");
+ my @CMD = ('asterisk', '-rx', 'skype show licenses');
+ exec @CMD or die "ERROR: Could not execute '@CMD': $!\n";
} elsif($pid == -1) {
die("fork() failed");
@@ -57,8 +57,8 @@
next;
}
- # This cames from STDERR actually.
- if (/Unable to connect/) {
+ # This proceses STDERR messages
+ if (/ERROR:|Unable to connect/) {
$status = $ERRORS{CRITICAL};
$message .= $_;
return;
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios-plugin-check_asterisk_skype/check_asterisk_skype?r1=1.2&r2=1.3&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
