tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 16:24:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Send sendmail errors to pandora_server.error.

Browse Source
This commit is contained in:
Ramon Novoa 2019-09-19 12:43:31 +02:00
parent 46b9841c47
commit 0e281c7a0a
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pandora_server/lib/PandoraFMS/Sendmail.pm
View File

@ -211,10 +211,10 @@ sub sendmail {
my $data = ref($_[$i]) ? $_[$i] : \$_[$i]; my $data = ref($_[$i]) ? $_[$i] : \$_[$i];
if ($mailcfg{'debug'} > 9) { if ($mailcfg{'debug'} > 9) {
if (length($$data) < 500) { if (length($$data) < 500) {
print ">", $$data; print STDERR ">", $$data;
} }
else { else {
print "> [...", length($$data), " bytes sent ...]\n"; print STDERR "> [...", length($$data), " bytes sent ...]\n";
} }
} }
my @sockets = $Sel->can_write($mailcfg{'timeout'}); my @sockets = $Sel->can_write($mailcfg{'timeout'});
@ -238,7 +238,7 @@ sub sendmail {
last if ($buffer =~ m/\n$/); last if ($buffer =~ m/\n$/);
} }
print "<$server_reply" if $mailcfg{'debug'} > 9; print STDERR "<$server_reply" if $mailcfg{'debug'} > 9;
if ($server_reply =~ /^[45]/) { if ($server_reply =~ /^[45]/) {
chomp $server_reply; chomp $server_reply;
return; # return false return; # return false
@ -363,7 +363,7 @@ sub sendmail {
$localhost = hostname() || 'localhost'; $localhost = hostname() || 'localhost';
foreach $server ( @{$mailcfg{'smtp'}} ) { foreach $server ( @{$mailcfg{'smtp'}} ) {
print "- trying $server\n" if $mailcfg{'debug'} > 9; print STDERR "- trying $server\n" if $mailcfg{'debug'} > 9;
$server =~ s/\s+//go; # remove spaces just in case of a typo $server =~ s/\s+//go; # remove spaces just in case of a typo
# extract port if server name like "mail.domain.com:2525" # extract port if server name like "mail.domain.com:2525"
@ -382,12 +382,12 @@ sub sendmail {
$S = new IO::Socket::SSL(PeerPort => $port, PeerAddr => $server, Proto => 'tcp', SSL_verify => 0, Domain => AF_INET); $S = new IO::Socket::SSL(PeerPort => $port, PeerAddr => $server, Proto => 'tcp', SSL_verify => 0, Domain => AF_INET);
} }
if ( $S ) { if ( $S ) {
print "- connected to $server\n" if $mailcfg{'debug'} > 9; print STDERR "- connected to $server\n" if $mailcfg{'debug'} > 9;
last; last;
} }
else { else {
$error .= "connect to $server failed\n"; $error .= "connect to $server failed\n";
print "- connect to $server failed, next server...\n" if $mailcfg{'debug'} > 9; print STDERR "- connect to $server failed, next server...\n" if $mailcfg{'debug'} > 9;
next; # next server next; # next server
} }
} }