[Benson-commit] CVS: benson3/handlers A10email.pm,1.6,1.7

[Bob T. <bt...@us...>]

Update of /cvsroot/benson/benson3/handlers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11347/handlers

Modified Files:
	A10email.pm 
Log Message:
Some fixes to the A10email handler.

Index: A10email.pm
===================================================================
RCS file: /cvsroot/benson/benson3/handlers/A10email.pm,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** A10email.pm	19 Jan 2004 19:19:09 -0000	1.6
--- A10email.pm	25 Jan 2004 17:36:05 -0000	1.7
***************
*** 9,15 ****
  
  	my $s = $t->server;
  	my %alertlist = %{$list};
  
! 	$s->trace("A10email opening $filename...",3);
  
  	open CONFIG, $filename || return -1;
--- 9,16 ----
  
  	my $s = $t->server;
+ 	my $identity = $t->identity;
  	my %alertlist = %{$list};
  
! 	$s->trace("($identity) A10email opening $filename...",3);
  
  	open CONFIG, $filename || return -1;
***************
*** 30,38 ****
  			($t->subsystem =~ m/$subsystem/) &&
  			($t->message =~ m/$message/) && ($total == $count)) {
! 				$s->trace("Matched for $alias",4);
  				my ($protocol, $parameter) = split /:/, $alias, 2;
  				if($protocol eq "file") {				
  					if($self->parse_file($parameter, $t, $emails) == -1) {
! 						$s->log("File $parameter not found!", WARNING);
  					}
  				} elsif($protocol eq "email") {
--- 31,39 ----
  			($t->subsystem =~ m/$subsystem/) &&
  			($t->message =~ m/$message/) && ($total == $count)) {
! 				$s->trace("($identity) Matched for $alias",4);
  				my ($protocol, $parameter) = split /:/, $alias, 2;
  				if($protocol eq "file") {				
  					if($self->parse_file($parameter, $t, $emails) == -1) {
! 						$s->log("($identity) File $parameter not found!", WARNING);
  					}
  				} elsif($protocol eq "email") {
***************
*** 57,65 ****
  	my $s = $t->server;
  	my $queue = new Benson();
  
- #	my %alertlist = %{$queue->sorted_href_alert_list()};
  	my $alertlist = $queue->sorted_href_alert_list();
! 	$s->trace("A10email action handler begins...",3);
! 	my $identity = $t->identity;
  	my $filename = $s->ServerRoot."/etc/email.conf";
  	my %emails;
--- 58,65 ----
  	my $s = $t->server;
  	my $queue = new Benson();
+ 	my $identity = $t->identity;
  
  	my $alertlist = $queue->sorted_href_alert_list();
! 	$s->trace("($identity) A10email action handler begins...",3);
  	my $filename = $s->ServerRoot."/etc/email.conf";
  	my %emails;
***************
*** 69,73 ****
  	#
  	if($self->parse_file($filename, $t, $alertlist, \%emails) == -1) {
! 		$s->log("File $filename not found!", WARNING);
  	}
  
--- 69,73 ----
  	#
  	if($self->parse_file($filename, $t, $alertlist, \%emails) == -1) {
! 		$s->log("($identity) File $filename not found!", FATAL);
  	}
  
***************
*** 76,81 ****
  	#
  	foreach my $email (keys %emails) {
! 		$s->trace("Sending alert($identity) email to $email", 3);
  		$self->send_email($email, $t);
  	}
  
--- 76,84 ----
  	#
  	foreach my $email (keys %emails) {
! 		$s->trace("($identity) Sending alert($identity) email to $email", 3);
  		$self->send_email($email, $t);
+ 		$queue->submit(severity => "informational",
+ 				subsystem => "A10email",
+ 				message => "Email for $identity sent to $email");
  	}
  
***************
*** 102,106 ****
  	my $subject = $t->agent.":".$t->severity.":".$t->subsystem.":".$t->message;
  	my $message = $t->message;
! 	$t->server->log("Sending an email to $alias", INFO);
  	open MAIL, "| /usr/lib/sendmail -t -n";
  	print MAIL <<EOT;
--- 105,109 ----
  	my $subject = $t->agent.":".$t->severity.":".$t->subsystem.":".$t->message;
  	my $message = $t->message;
! 	$t->server->log("($identity) Sending an email to $alias", INFO);
  	open MAIL, "| /usr/lib/sendmail -t -n";
  	print MAIL <<EOT;