From 3247e9cd78e6bfbea9e3e18805ea6c930b04aee5 Mon Sep 17 00:00:00 2001
From: Tobi Oetiker <tobi@oetiker.ch>
Date: Sat, 12 Feb 2005 09:58:20 +0000
Subject: be more careful after seting up Net::SMTP and Net::SNPP only use the
 handle if we got one ...

---
 lib/Smokeping.pm | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

(limited to 'lib')

diff --git a/lib/Smokeping.pm b/lib/Smokeping.pm
index e8a59d7..0606467 100644
--- a/lib/Smokeping.pm
+++ b/lib/Smokeping.pm
@@ -144,29 +144,33 @@ sub sendmail ($$$){
     my $to = shift;
     $to = $1 if $to =~ /<(.*?)>/;
     my $body = shift;
-    if ($cfg->{General}{mailhost}){
-	my $smtp = Net::SMTP->new($cfg->{General}{mailhost});
-	$smtp->mail($from);
-	$smtp->to(split(/\s*,\s*/, $to));
-	$smtp->data();
-	$smtp->datasend($body);
-	$smtp->dataend();
-	$smtp->quit;
+    if ($cfg->{General}{mailhost} and  
+        my $smtp = Net::SMTP->new($cfg->{General}{mailhost})){
+        $smtp->mail($from);
+        $smtp->to(split(/\s*,\s*/, $to));
+        $smtp->data();
+        $smtp->datasend($body);
+        $smtp->dataend();
+        $smtp->quit;
     } elsif ($cfg->{General}{sendmail} or -x "/usr/lib/sendmail"){
-	open (M, "|-") || exec (($cfg->{General}{sendmail} || "/usr/lib/sendmail"),"-f",$from,$to);
-	print M $body;
-	close M;
+        open (M, "|-") || exec (($cfg->{General}{sendmail} || "/usr/lib/sendmail"),"-f",$from,$to);
+        print M $body;
+        close M;
+    } else {
+        warn "ERROR: not sending mail to $to, as all methodes failed\n";
     }
 }
 
 sub sendsnpp ($$){
    my $to = shift;
    my $msg = shift;
-   if ($cfg->{General}{snpphost}){
-        my $snpp = Net::SNPP->new($cfg->{General}{snpphost}, Timeout => 60);
+   if ($cfg->{General}{snpphost} and
+        my $snpp = Net::SNPP->new($cfg->{General}{snpphost}, Timeout => 60)){
         $snpp->send( Pager => $to,
                      Message => $msg) || do_debuglog("ERROR - ". $snpp->message);
         $snpp->quit;
+    } else {
+        warn "ERROR: not sending page to $to, as all SNPP setup faild\n";
     }
 }
 
-- 
cgit v1.2.3-24-g4f1b