[Mon-commit] mon mon,1.4.2.8,1.4.2.9

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

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

Modified Files:
      Tag: mon-1-0-0pre1
	mon 
Log Message:


handle_trap_timeout now calls process_event, and it works fine with
alert/upalert/alertevery/etc. as shown by my testing



Index: mon
===================================================================
RCS file: /cvsroot/mon/mon/mon,v
retrieving revision 1.4.2.8
retrieving revision 1.4.2.9
diff -C2 -d -r1.4.2.8 -r1.4.2.9
*** mon	9 Jul 2004 03:17:32 -0000	1.4.2.8
--- mon	9 Jul 2004 13:27:33 -0000	1.4.2.9
***************
*** 2966,2969 ****
--- 2966,2974 ----
  	}
  
+ 	elsif ($type eq "T")
+ 	{
+ 	    do_alert ($group, $service, $output, $exitval, $FL_TRAPTIMEOUT);
+ 	}
+ 
  	$sref->{"_failure_output"} = $output;
      }
***************
*** 3967,3990 ****
      my $sref = \%{$watch{$group}->{$service}};
      $sref->{"_trap_timer"} = $sref->{"traptimeout"};
-     $sref->{"_failure_count"}++;
-     $sref->{"_consec_failures"}++;
-     $sref->{"_last_failure"} = $tmnow;
-     if ($sref->{"_op_status"} == $STAT_OK ||
- 	    $sref->{"_op_status"} == $STAT_UNKNOWN ||
- 	    $sref->{"_op_status"} == $STAT_UNTESTED)
-     {
- 	$sref->{"_first_failure"} = $tmnow;
-     }
-     set_op_status ($group, $service, $STAT_FAIL);
-     $sref->{"_last_summary"} = "trap timeout";
-     $sref->{"_last_detail"} = "trap timeout after " . $sref->{"traptimeout"} . "s at " . localtime ($tmnow) . "\n";
-     shift @last_failures if (@last_failures > $CF{"MAX_KEEP"});
-     push @last_failures, "$group $service $tm $sref->{_last_summary}";
-     syslog ('crit', "failure for $last_failures[-1]");
  
!     do_alert ($group, $service, "$sref->{_last_summary}\n$sref->{_last_detail}",
! 		0, $FL_TRAPTIMEOUT);
! 
!     $sref->{"_failure_output"} = "$sref->{_last_summary}\n$sref->{_last_detail}";
  }
  
--- 3972,3979 ----
      my $sref = \%{$watch{$group}->{$service}};
      $sref->{"_trap_timer"} = $sref->{"traptimeout"};
  
!     process_event ("T", $group, $service, 1,
!     	"trap timeout\n" .
! 	"trap timeout after " . $sref->{"traptimeout"} . "s at " . localtime ($tmnow) . "\n");
  }