[Benson-commit] CVS: benson2/src/modules/Handlers/lib/Benson/Handlers Monitor.pm,1.10,1.11

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

Update of /cvsroot/benson/benson2/src/modules/Handlers/lib/Benson/Handlers
In directory usw-pr-cvs1:/tmp/cvs-serv24671/src/modules/Handlers/lib/Benson/Handlers

Modified Files:
	Monitor.pm 
Log Message:
This is somewhat experimental stuff, don't use for real

Index: Monitor.pm
===================================================================
RCS file: /cvsroot/benson/benson2/src/modules/Handlers/lib/Benson/Handlers/Monitor.pm,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** Monitor.pm	2001/06/17 20:35:35	1.10
--- Monitor.pm	2001/07/15 02:00:55	1.11
***************
*** 37,44 ****
  	$s->trace("Benson::Handlers::Monitor begins",1);
  
- 	my $queue = new Benson(forwarder => $s->Forwarder,
- 				port => $s->Port);
- 	$s->Queue($queue);
  	while(1) {
  		$s->trace("Starting monitoring loop",4);
  		eval {
--- 37,44 ----
  	$s->trace("Benson::Handlers::Monitor begins",1);
  
  	while(1) {
+ 		my $queue = new Benson(forwarder => $s->Forwarder,
+ 					port => $s->Port);
+ 		$s->Queue($queue);
  		$s->trace("Starting monitoring loop",4);
  		eval {
***************
*** 53,58 ****
  
  			$s->trace("4) sleeping ZZZzzzz...",4);
- 			sleep($s->LoopInterval);
  		}; print $@ if $@; 
  	}
  	return OK;
--- 53,60 ----
  
  			$s->trace("4) sleeping ZZZzzzz...",4);
  		}; print $@ if $@; 
+ 		undef $queue;
+ 		$s->Queue($queue);
+ 		sleep($s->LoopInterval);
  	}
  	return OK;
***************
*** 61,68 ****
  sub action_loop {
  	my ($queue,$s) = @_;
! 	my $array_ref = $queue->alert_list(forwarder => $s->Forwarder);
  	my @alerts = @{$array_ref};
  
- 	$s->trace("Action loop start...", 3);
  	for (my $current_alert=0;$current_alert<=$#alerts;$current_alert++) {		
  		my %alert = %{$alerts[$current_alert]};
--- 63,70 ----
  sub action_loop {
  	my ($queue,$s) = @_;
! 	$s->trace("Action loop start...", 3);
! 	my $array_ref = $queue->alert_list();
  	my @alerts = @{$array_ref};
  
  	for (my $current_alert=0;$current_alert<=$#alerts;$current_alert++) {		
  		my %alert = %{$alerts[$current_alert]};
***************
*** 83,87 ****
  			my $clean_aref = \@clean_alerts;
  
! 			my $trap_ref = new Benson::Alert ($s,$clean_aref);
  			$trap_ref->identity($alert{"identity"});
  			$trap_ref->agent($alert{"agent"});
--- 85,89 ----
  			my $clean_aref = \@clean_alerts;
  
! 			my $trap_ref = new Benson::Alert ($s);
  			$trap_ref->identity($alert{"identity"});
  			$trap_ref->agent($alert{"agent"});
***************
*** 98,107 ****
  				$s->trace("Calling action handler",2);
  				Benson::Handlers::Action::handler($trap_ref);				
! 				$queue->update_status(forwarder => $s->Forwarder,
! 							identity => $alert{"identity"},
  							status => "processed");
  			} else {
! 				$queue->update_status(forwarder => $s->Forwarder,
! 							identity => $alert{"identity"},
  							status => "acknowledge:suppress");
  			}
--- 100,107 ----
  				$s->trace("Calling action handler",2);
  				Benson::Handlers::Action::handler($trap_ref);				
! 				$queue->update_status(identity => $alert{"identity"},
  							status => "processed");
  			} else {
! 				$queue->update_status(identity => $alert{"identity"},
  							status => "acknowledge:suppress");
  			}
***************
*** 113,117 ****
  sub acknowledge_loop {
  	my ($queue,$s) = @_;
! 	my $array_ref = $queue->alert_list(forwarder => $s->Forwarder);
  	my @alerts = @{$array_ref};
  	$s->trace("Acknowledge loop start...", 3);
--- 113,117 ----
  sub acknowledge_loop {
  	my ($queue,$s) = @_;
! 	my $array_ref = $queue->alert_list();
  	my @alerts = @{$array_ref};
  	$s->trace("Acknowledge loop start...", 3);
***************
*** 136,141 ****
  				Benson::Handlers::Logger::handler($trap_ref);
  			}
! 			$queue->clear(forwarder => $s->Forwarder,
! 					identity => $alert{"identity"});
  			$s->log("Alert ".$alert{"identity"}." acknowledged.", 4);
  			$s->log("Alert ".$alert{"identity"}." acknowledged.", INFO);
--- 136,140 ----
  				Benson::Handlers::Logger::handler($trap_ref);
  			}
! 			$queue->clear(identity => $alert{"identity"});
  			$s->log("Alert ".$alert{"identity"}." acknowledged.", 4);
  			$s->log("Alert ".$alert{"identity"}." acknowledged.", INFO);
***************
*** 209,214 ****
  	# Check conditional
  	if($bad_thing eq "exists") {
! 		$queue->submit(forwarder => $s->Forwarder,
! 				agent => $s->Hostname,
  				severity => "GadZooks!",
  				subsystem => "tectonic plates",	
--- 208,212 ----
  	# Check conditional
  	if($bad_thing eq "exists") {
! 		$queue->submit(agent => $s->Hostname,
  				severity => "GadZooks!",
  				subsystem => "tectonic plates",