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

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

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

Modified Files:
	Monitor.pm 
Log Message:
Major bug fixes, and some small feature enhancments, looking into the memory leak bug that crop'd up again.

Index: Monitor.pm
===================================================================
RCS file: /cvsroot/benson/benson2/src/modules/Handlers/lib/Benson/Handlers/Monitor.pm,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** Monitor.pm	2001/06/01 17:30:26	1.9
--- Monitor.pm	2001/06/17 20:35:35	1.10
***************
*** 37,49 ****
  	$s->trace("Benson::Handlers::Monitor begins",1);
  
! 	my $queue = new Benson;
  	while(1) {
! 		action_loop($queue, $s);
! 
! 		acknowledge_loop($queue, $s);		
! 
! 		run_rules_monitor($s);
! 
! 		sleep($s->LoopInterval);
  	}
  	return OK;
--- 37,58 ----
  	$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 {
! 			$s->trace("1) starting action sub-section",4);
! 			action_loop($queue, $s);
! 
! 			$s->trace("2) starting acknowledge sub-section",4);
! 			acknowledge_loop($queue, $s);		
! 
! 			$s->trace("3) starting rules sub-section",4);
! 			run_rules_monitor($s);
! 
! 			$s->trace("4) sleeping ZZZzzzz...",4);
! 			sleep($s->LoopInterval);
! 		}; print $@ if $@; 
  	}
  	return OK;
***************
*** 143,149 ****
--- 152,160 ----
  	my $d = new DirHandle $server_root."/lib/perl";	
  	if(defined $d) {
+ 		$s->trace("Monitors were found...",4);
  		while(defined($_ = $d->read)) {
  			my $file = $_;
  			if(rule_or_monitor($s,$file)) {
+ 				$s->trace("Processing monitor....$file",4);
  				my $pkg = clean_pkg($file);
  				eval { 
***************
*** 159,162 ****
--- 170,174 ----
  				}; $s->log($@,1) if $@;
  				undef $pkg;
+ 				$s->trace("Monitor processing for $file completed.",4);
  			}
  			undef $file;