cambio modulo x email

This commit is contained in:
2020-12-24 23:14:14 +01:00
parent 5988453a5a
commit b5724a63f6
2 changed files with 65 additions and 56 deletions

View File

@@ -3,7 +3,7 @@
use warnings;
use strict;
use DBI;
use Mail::Sender;
use MIME::Lite;
use Data::Dumper;
# Variables
@@ -22,6 +22,7 @@ my $gd_tool = 0;
my $email_addr =
'andrea.segalini@aseltd.eu,andrea.carri@aseltd.eu,roberto.savi@aseltd.eu,edoardo.cavalca@aseltd.eu,alessandro.valletta@aseltd.eu,alessandro.battilani@gmail.com,corrado@geielettronica.it,luca.chiapponi@aseltd.eu';
my $cc_email_addr = $email_addr;
my $from = 'ASE Alert System<alert@aseltd.eu>';
sub getLoggingTime {
my ( $sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $isdst ) =
@@ -88,28 +89,27 @@ END_MSG
}
sub emailSend {
my $sender = new Mail::Sender {
auth => 'PLAIN',
authid => 'ase.mums.alert@gmail.com',
authpwd => 'ASE@mums2013F!',
smtp => 'smtp.gmail.com',
port => 587,
from => 'ASE Alert System',
to => $email_addr,
cc => $cc_email_addr,
subject => $email_obj,
msg => $email_msg,
ctype => "text/html",
encoding => "7bit"
};
my $msg = MIME::Lite->new(
From => $from,
To => $email_addr,
Cc => $cc_email_addr,
Subject => $email_obj,
Data => $email_msg
);
my $mail_res = $sender->MailMsg( { msg => $sender->{msg}, } );
if ( ref($mail_res) ne "Mail::Sender" ) {
print getLoggingTime() . " - $mail_res: $sender->{error_msg} \n";
}
else {
$msg->attr( "content-type" => "text/html" );
if ($msg->send(
'smtp', "smtps.aruba.it",
AuthUser => "alert\@aseltd.eu",
AuthPass => "Ase#2013!20\@bat",
Port => 465,
SSL => 1,
Debug => 0
)) {
print getLoggingTime() . " - $email_obj\n";
print getLoggingTime() . " - Mail sent to: $email_addr.\n";
} else {
print getLoggingTime() . " - Error in sending mail to: $email_addr.\n";
}
}
@@ -262,7 +262,9 @@ foreach my $tool ( sort grep { /DT|PT/ } keys %ToolName ) {
$tools_info .= "<tr>";
}
elsif ( $ToolName{$tool}{'ToolState'} eq 'Active' ) {
if ( $ToolName{ 'site' . $ToolName{$tool}{'idSite'} }{'SiteAlarmEmail'} eq "" ) {
if ( $ToolName{ 'site' . $ToolName{$tool}{'idSite'} }{'SiteAlarmEmail'}
eq "" )
{
$Tools_infoCompany{ $ToolName{$tool}{'idCompany'} } .=
"<tr bgcolor=\"#fddada\">" . $tool_part;
}
@@ -301,8 +303,8 @@ foreach my $comp ( keys %Tools_infoCompany ) {
foreach my $site ( keys %Tools_infoCompanySite ) {
$tools_info = $Tools_infoCompanySite{$site};
my $site_email = $ToolName{'site' . $site}{'SiteAlarmEmail'};
my $send_alarm = $ToolName{'site' . $site}{'SendAlarm'};
my $site_email = $ToolName{ 'site' . $site }{'SiteAlarmEmail'};
my $send_alarm = $ToolName{ 'site' . $site }{'SendAlarm'};
print getLoggingTime()
. " - Site email: $site_email - Send Alarm: $send_alarm\n";
if ( $send_alarm == 1 ) {
@@ -310,7 +312,7 @@ foreach my $site ( keys %Tools_infoCompanySite ) {
makeEmailMsg();
emailSend();
#print $email_msg;print "|||||||||||||||=====================|||||||||||||||\n";
#print $email_msg;print "|||||||||||||||=====================|||||||||||||||\n";
}
}

71
LoadCSVData.pl Normal file → Executable file
View File

@@ -8,7 +8,7 @@ use File::Basename qw( fileparse );
use List::Util qw( max );
use Data::Dumper qw(Dumper);
use Cwd;
use Mail::Sender;
use MIME::Lite;
$|++; # Autoflush
@@ -21,9 +21,10 @@ my $server = 'localhost';
my $db_name = "ase_lar";
my $table = "RAWDATACOR";
my ( @CSVData, @sql );
my $outcount = 0;
my $outfilenum = 0;
my $maxsqllines = 10000;
my $outcount = 0;
my $outfilenum = 0;
my $maxsqllines = 10000;
my $csv_x_ftp_dir = '/home/asega/.csv_x_ftp';
my (
$tool, $toolbatt, $tooltemp, $tooltype, @channels,
@NewData, @ain, @din, @nodetype, $GDEventDate
@@ -47,6 +48,7 @@ my $matlab_error = '';
my $matlab_timeout = '1800';
my $email_addr =
'andrea.carri@aseltd.eu,edoardo.cavalca@aseltd.eu,alessandro.battilani@gmail.com,alessandro.valletta@aseltd.eu';
my $from = 'ASE Alert System<alert@aseltd.eu>';
my ( $email_msg, $email_obj );
my $G201_fcheck = 0;
my $D2W_fcheck = 0;
@@ -190,6 +192,7 @@ sub trxelab {
# Disconnect
my $fileelab;
if ( $ftp_filename eq "" ) {
$fileelab =
'/var/lib/mysql-files/'
@@ -225,6 +228,7 @@ sub trxelab {
) or die getTimeStamp("log") . " - pid $$ >> $DBI::errstr";
$dbh->disconnect;
$ftp_parm //= "";
$ftp_parm =~ s/\s//g;
@@ -236,7 +240,9 @@ sub trxelab {
my ( $key, $val ) = split( /=>/, $parm );
$ftp_parms{$key} = $val;
}
my $name = POSIX::cuserid();
print getTimeStamp("log")
. " - pid $$ >> Current user id: $name\n";
print getTimeStamp("log")
. " - pid $$ >> $unit - $tool ftp parm:\n"
. Dumper(%ftp_parms);
@@ -442,29 +448,30 @@ END_MSG
sub emailSend {
$email_obj = 'Matlab error on unit ' . $unit . ' - tool ' . $tool;
my $msg = MIME::Lite->new(
From => $from,
To => $email_addr,
Subject => $email_obj,
Data => $email_msg
);
my $sender = new Mail::Sender {
auth => 'PLAIN',
authid => 'ase.mums.alert@gmail.com',
authpwd => 'ASE@mums2013F!',
smtp => 'smtp.gmail.com',
port => 587,
from => 'ASE Alert System',
to => $email_addr,
subject => $email_obj,
msg => $email_msg,
ctype => "text/html",
encoding => "7bit"
};
my $mail_res = $sender->MailMsg( { msg => $sender->{msg}, } );
if ( ref($mail_res) ne "Mail::Sender" ) {
print getTimeStamp("log")
. " - pid $$ >> $mail_res: $sender->{error_msg} \n";
$msg->attr( "content-type" => "text/html" );
if (
$msg->send(
'smtp', "smtps.aruba.it",
AuthUser => "alert\@aseltd.eu",
AuthPass => "Ase#2013!20\@bat",
Port => 465,
SSL => 1,
Debug => 0
)
)
{
print getLoggingTime() . " - $email_obj\n";
print getLoggingTime() . " - Mail sent to: $email_addr.\n";
}
else {
print getTimeStamp("log") . " - pid $$ >> $email_obj\n";
print getTimeStamp("log") . " - pid $$ >> Mail sent to: $email_addr.\n";
print getLoggingTime() . " - Error in sending mail to: $email_addr.\n";
}
}
@@ -562,14 +569,14 @@ while ( my $line = <FILE> ) {
#$NodeData =~ s/Dis\./N\/A/g;
@NewData = grep /\S/, split( /\||;/, $NodeData );
if ( scalar (@NewData) != 0 ) {
my $idx = 0;
if ( scalar(@NewData) != 0 ) {
my $idx = 0;
$CSVData[ $idx++ ] = join( ';', splice( @NewData, 0, 2 ) );
foreach my $ch (@channels) {
$CSVData[ $idx++ ] =
join( ';', splice( @NewData, 0, $ch ) );
}
$CSVData[ $idx++ ] = join( ';', splice( @NewData, 0, 2 ) );
foreach my $ch (@channels) {
$CSVData[ $idx++ ] =
join( ';', splice( @NewData, 0, $ch ) );
}
}
}
elsif ( $tooltype eq "MUSA" ) {