[Benson-commit] CVS: benson3/handlers A10email.pm,1.10,1.11

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

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

Modified Files:
	A10email.pm 
Log Message:
Added the latest changes.

Index: A10email.pm
===================================================================
RCS file: /cvsroot/benson/benson3/handlers/A10email.pm,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** A10email.pm	19 Feb 2004 01:59:03 -0000	1.10
--- A10email.pm	14 May 2004 03:10:32 -0000	1.11
***************
*** 27,30 ****
--- 27,34 ----
  	my $current_weekday = $current_weekday - 1; # 0-6 starting on Monday
  
+ 	if((!defined $start) && (!defined $end) && (!defined $weekday)) {
+ 		return 1;
+ 	}
+ 
  	my @days;
  	push @days, substr($weekday, 1, 1); # Monday
***************
*** 73,89 ****
  
  sub parse_xml_rule_block {
! 	my ($self, $rule_name, $rule_ref) = @_;
  
  	my %hash;
! 	$hash{line_count} = $rule_name;	
! 	$hash{count} = $rule_ref->{rule}->{$rule_name}->{count} || ".*";
! 	$hash{starttime} = $rule_ref->{rule}->{$rule_name}->{time}->{start};
! 	$hash{endtime} = $rule_ref->{rule}->{$rule_name}->{time}->{end};
! 	$hash{weekday} = $rule_ref->{rule}->{$rule_name}->{time}->{weekday};
  
  	#
  	# Grab the agents
  	#
! 	my $agents = $rule_ref->{rule}->{$rule_name}->{agent};
  	if(ref($agents) eq "ARRAY") { ### for multiple values
  		foreach my $agent (@{$agents}) {
--- 77,93 ----
  
  sub parse_xml_rule_block {
! 	my ($self, $rule, $rule_ref) = @_;
  
  	my %hash;
! 	$hash{line_count} = $rule->{name};	
! 	$hash{count} = $rule->{count} || ".*";
! 	$hash{starttime} = $rule->{time}->{start};
! 	$hash{endtime} = $rule->{time}->{end};
! 	$hash{weekday} = $rule->{time}->{weekday};
  
  	#
  	# Grab the agents
  	#
! 	my $agents = $rule->{agent};
  	if(ref($agents) eq "ARRAY") { ### for multiple values
  		foreach my $agent (@{$agents}) {
***************
*** 99,103 ****
  	# Grab the severities
  	#
! 	my $severities = $rule_ref->{rule}->{$rule_name}->{severity};
  	if(ref($severities) eq "ARRAY") { ### for multiple values
  		foreach my $severity (@{$severities}) {
--- 103,107 ----
  	# Grab the severities
  	#
! 	my $severities = $rule->{severity};
  	if(ref($severities) eq "ARRAY") { ### for multiple values
  		foreach my $severity (@{$severities}) {
***************
*** 113,117 ****
  	# Grab the subsystems
  	#
! 	my $subsystems = $rule_ref->{rule}->{$rule_name}->{subsystem};
  	if(ref($subsystems) eq "ARRAY") { ### for multiple values
  		foreach my $subsystem (@{$subsystems}) {
--- 117,121 ----
  	# Grab the subsystems
  	#
! 	my $subsystems = $rule->{subsystem};
  	if(ref($subsystems) eq "ARRAY") { ### for multiple values
  		foreach my $subsystem (@{$subsystems}) {
***************
*** 127,131 ****
  	# Grab the messages
  	#
! 	my $messages = $rule_ref->{rule}->{$rule_name}->{message};
  	if(ref($messages) eq "ARRAY") { ### for multiple values
  		foreach my $subsystem (@{$messages}) {
--- 131,135 ----
  	# Grab the messages
  	#
! 	my $messages = $rule->{message};
  	if(ref($messages) eq "ARRAY") { ### for multiple values
  		foreach my $subsystem (@{$messages}) {
***************
*** 138,143 ****
  	}
  
! 	my $alias = join ":", ($rule_ref->{rule}->{$rule_name}->{action}->{type},
! 			$rule_ref->{rule}->{$rule_name}->{action}->{value});
  
  	$hash{action} = $self->parse_legacy_alias($alias);
--- 142,147 ----
  	}
  
! 	my $alias = join ":", ($rule->{action}->{type},
! 			$rule->{action}->{value});
  
  	$hash{action} = $self->parse_legacy_alias($alias);
***************
*** 177,184 ****
  	$s->trace("M ($identity) A10email opening xml $filename...", 3);
  
! 	my $ref = $xs->XMLin($filename);
  
! 	foreach my $rule_name (keys %{$ref->{rule}}) {
! 		push @rules, $self->parse_xml_rule_block($rule_name, $ref);
  	}
  
--- 181,188 ----
  	$s->trace("M ($identity) A10email opening xml $filename...", 3);
  
! 	my $ref = $xs->XMLin($filename, KeyAttr => "rule");
  
! 	foreach my $rule (@{$ref->{rule}}) {
! 		push @rules, $self->parse_xml_rule_block($rule, $ref);
  	}
  
***************
*** 400,404 ****
  	my $alertlist = $queue->sorted_href_alert_list();
  	$s->trace("M ($identity) A10email action handler begins...",3);
! 	my $filename = $s->ServerRoot."/etc/email.conf";
  
  
--- 404,408 ----
  	my $alertlist = $queue->sorted_href_alert_list();
  	$s->trace("M ($identity) A10email action handler begins...",3);
! 	my $filename = $s->ServerRoot."/etc/email.xml";
  
  
***************
*** 406,410 ****
  	# Populate a list of rules. (prime the pump)
  	#
! 	if(($rules = $self->parse_legacy_file($filename, $t)) == -1) {
  		$s->log("M ($identity) File $filename not found!", FATAL);
  	}
--- 410,414 ----
  	# Populate a list of rules. (prime the pump)
  	#
! 	if(($rules = $self->parse_xml_file($filename, $t)) == -1) {
  		$s->log("M ($identity) File $filename not found!", FATAL);
  	}