Add branch exim-4_90+fixes

[buildfarm-server.git] / bf-alerts.pl

diff --git a/bf-alerts.pl b/bf-alerts.pl
index 091b55849ce5e9c6269f308fa4def9ff304fd157..c038f963b0b6fd76bdb1239e8be6104cb7017c01 100755 (executable)
--- a/bf-alerts.pl
+++ b/bf-alerts.pl
@@ -23,7 +23,9 @@ use vars qw($dbhost $dbname $dbuser $dbpass $dbport
        $default_host
 );
 
        $default_host
 );
 

-require "$ENV{BFConfDir}/BuildFarmWeb.pl";
+
+use FindBin qw($RealBin);
+require "$RealBin/BuildFarmWeb.pl";

 
 die "no dbname" unless $dbname;
 die "no dbuser" unless $dbuser;
 
 die "no dbname" unless $dbname;
 die "no dbuser" unless $dbuser;


@@ -116,10 +118,6 @@ print "starting alert run: $lts\n";
 
 foreach my $sysbranch (@last_heard)
 {
 
 foreach my $sysbranch (@last_heard)
 {

-       # not all versions of DBD::Pg decode modern bytea literals nicely. cope.
-       $sysbranch->{config} =~ s/^(\\?x)([a-fA-F0-9]+)$/pack('H*',$2)/e;
-
-

     my $client_conf = thaw $sysbranch->{config};
 
     my %client_alert_settings = %{ $client_conf->{alerts} || {} };
     my $client_conf = thaw $sysbranch->{config};
 
     my %client_alert_settings = %{ $client_conf->{alerts} || {} };


@@ -202,7 +200,7 @@ my $me = `id -un`; chomp $me;
 my $host = `hostname`; chomp ($host);
 $host = $default_host unless ($host =~ m/[.]/ || !defined($default_host));
 
 my $host = `hostname`; chomp ($host);
 $host = $default_host unless ($host =~ m/[.]/ || !defined($default_host));
 

-my $from_addr = "PG Build Farm <$me\@$host>";
+my $from_addr = "Exim BuildFarm <$me\@$host>";

 $from_addr =~ tr /\r\n//d;
 
 
 $from_addr =~ tr /\r\n//d;
 
 


@@ -236,7 +234,7 @@ foreach my $clearme (@need_cleared)
     # $sth->finish;
 
     $msg->to($mailto);
     # $sth->finish;
 
     $msg->to($mailto);

-    $msg->subject("PGBuildfarm member $animal Branch $branch Alert cleared");
+    $msg->subject("Exim BuildFarm member $animal Branch $branch Alert cleared");

     my $fh = $msg->open;
     print $fh "\n\n$text\n"; 
     $fh->close;
     my $fh = $msg->open;
     print $fh "\n\n$text\n"; 
     $fh->close;


@@ -265,7 +263,7 @@ foreach my $needme (@need_alerts)
 
     $msg->to($mailto);
 
 
     $msg->to($mailto);
 

-    $msg->subject("PGBuildfarm member $animal Branch $branch " .
+    $msg->subject("Exim BuildFarm member $animal Branch $branch " .

                  "Alert notification");
     my $fh = $msg->open;
     print $fh "\n\n$text\n"; 
                  "Alert notification");
     my $fh = $msg->open;
     print $fh "\n\n$text\n";