[Mon-commit] mon mon,1.4.2.6,1.4.2.7

[Jim T. <tr...@us...>]

Update of /cvsroot/mon/mon
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26610

Modified Files:
      Tag: mon-1-0-0pre1
	mon 
Log Message:
fixed a problem where traps would not reset the _trap_timer, thus making a trap timeout unpreventable

Index: mon
===================================================================
RCS file: /cvsroot/mon/mon/mon,v
retrieving revision 1.4.2.6
retrieving revision 1.4.2.7
diff -C2 -d -r1.4.2.6 -r1.4.2.7
*** mon	24 Jun 2004 14:18:25 -0000	1.4.2.6
--- mon	28 Jun 2004 20:10:21 -0000	1.4.2.7
***************
*** 391,395 ****
  		    if ($sref->{"_trap_timer"} <= 0 && $tm - $sref->{"_last_uptrap"} >
  				$sref->{"traptimeout"}) {
- 			$sref->{"_trap_timer"} = $sref->{"traptimeout"};
  			handle_trap_timeout ($group, $service);
  		    }
--- 391,394 ----
***************
*** 3876,3879 ****
--- 3875,3886 ----
      $sref->{"_last_summary"} = $trap{"sum"};
  
+     #
+     # a trap recieved resets the trap timeout timer
+     #
+     if (exists $sref->{"traptimeout"})
+     {
+ 	$sref->{"_trap_timer"} = $sref->{"traptimeout"};
+     }
+ 
      if ($intended)
      {
***************
*** 4024,4027 ****
--- 4031,4035 ----
  
      my $sref = \%{$watch{$group}->{$service}};
+     $sref->{"_trap_timer"} = $sref->{"traptimeout"};
      $sref->{"_failure_count"}++;
      $sref->{"_last_failure"} = $tmnow;