[Benson-commit] CVS: benson3/handlers S05benson.pm,1.7,1.8

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

Update of /cvsroot/benson/benson3/handlers
In directory sc8-pr-cvs1:/tmp/cvs-serv8229/handlers

Modified Files:
	S05benson.pm 
Log Message:
Added some good suppression logic into S05benson

Index: S05benson.pm
===================================================================
RCS file: /cvsroot/benson/benson3/handlers/S05benson.pm,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** S05benson.pm	26 Jun 2003 20:23:22 -0000	1.7
--- S05benson.pm	11 Nov 2003 19:32:53 -0000	1.8
***************
*** 7,11 ****
  
  sub suppress {
! 	my ($self, $data) = @_;
  	my ($everything, $reason) = split /reason\:/, $data, 2;
  	my @name_value_pairs = split /\s+/, $everything;
--- 7,11 ----
  
  sub suppress {
! 	my ($self, $data, $t) = @_;
  	my ($everything, $reason) = split /reason\:/, $data, 2;
  	my @name_value_pairs = split /\s+/, $everything;
***************
*** 15,21 ****
  		$hash{$name} = $value;
  	}
! 	my $agent = $hash{agent} || "null";
! 	my $starttime = $hash{starttime} || "0000-00-00_00:00:00";
! 	my $endtime = $hash{endtime} || "0000-00-00_00:00:00";
  	if(defined $hash{duration}) {
  		# calculate startime in epoch seconds
--- 15,23 ----
  		$hash{$name} = $value;
  	}
! 	my $current_time = POSIX::strftime("%Y-%m-%d_%H:%M:%S", localtime(time));
! 	my $default_endtime = POSIX::strftime("%Y-%m-%d_%H:%M:%S", localtime(time + 1800));
! 	my $agent = $hash{agent} || $t->agent;
! 	my $starttime = $hash{starttime} || $current_time;
! 	my $endtime = $hash{endtime} || $default_endtime;
  	if(defined $hash{duration}) {
  		# calculate startime in epoch seconds
***************
*** 67,72 ****
  	}
  
! 	my $id = $hash{identity};
! 	my $sql_remove = <<EOSQL;
  UPDATE
  	suppress
--- 69,78 ----
  	}
  
! 	my $id = $hash{identity} || "null";
! 	my $agent = $hash{agent} || "null";
! 	my $sql_remove;
! 
! 	if($id ne "null") {
! 		$sql_remove = <<EOSQL;
  UPDATE
  	suppress
***************
*** 76,79 ****
--- 82,97 ----
  	suppress_id = $id
  EOSQL
+ 	} elsif ($agent ne "null") {
+ 		$sql_remove = <<EOSQL;
+ UPDATE
+ 	suppress
+ SET
+ 	remove = 'Y'
+ WHERE
+ 	agent = $agent
+ EOSQL
+ 	} else {
+ 		return;
+ 	}
  
  	my $dbh = DBI->connect($s->DBIConnectString, $s->DBIUsername, $s->DBIPassword);
***************
*** 124,128 ****
  		if($action eq "suppress") {
  			$s->trace("We have been asked to suppress something.", 4);
! 			$self->suppress($data);
  			return SUPPRESS_LOG;
  		} elsif($action eq "suppress_remove") {
--- 142,146 ----
  		if($action eq "suppress") {
  			$s->trace("We have been asked to suppress something.", 4);
! 			$self->suppress($data, $t);
  			return SUPPRESS_LOG;
  		} elsif($action eq "suppress_remove") {