[Nagios-checkins] nagios/xdata xrddefault.c,1.65,1.66

[Ethan G. <ega...@us...>]

Update of /cvsroot/nagios/nagios/xdata
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv3695/xdata

Modified Files:
	xrddefault.c 
Log Message:
Fix for handling hard problem states with modified max check attempts in retention data

Index: xrddefault.c
===================================================================
RCS file: /cvsroot/nagios/nagios/xdata/xrddefault.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** xrddefault.c	8 Dec 2008 17:30:27 -0000	1.65
--- xrddefault.c	23 Jan 2009 16:31:32 -0000	1.66
***************
*** 3,8 ****
   * XRDDEFAULT.C - Default external state retention routines for Nagios
   *
!  * Copyright (c) 1999-2008 Ethan Galstad (ega...@na...)
!  * Last Modified: 12-04-2008
   *
   * License:
--- 3,8 ----
   * XRDDEFAULT.C - Default external state retention routines for Nagios
   *
!  * Copyright (c) 1999-2009 Ethan Galstad (ega...@na...)
!  * Last Modified: 01-23-2009
   *
   * License:
***************
*** 772,777 ****
  						temp_host->next_host_notification=get_next_host_notification_time(temp_host,temp_host->last_host_notification);
  
! 					/* update host status */
! 					update_host_status(temp_host,FALSE);
  
  					/* ADDED 02/20/08 assume same flapping state if large install tweaks enabled */
--- 772,779 ----
  						temp_host->next_host_notification=get_next_host_notification_time(temp_host,temp_host->last_host_notification);
  
! 					/* ADDED 01/23/2009 adjust current check attempts if host in hard problem state (max attempts may have changed in config since restart) */
! 					if(temp_host->current_state!=HOST_UP && temp_host->state_type==HARD_STATE)
! 						temp_host->current_attempt=temp_host->max_attempts;
! 					   
  
  					/* ADDED 02/20/08 assume same flapping state if large install tweaks enabled */
***************
*** 800,803 ****
--- 802,808 ----
  					if(temp_host->last_hard_state_change==(time_t)0)
  						temp_host->last_hard_state_change=temp_host->last_state_change;
+ 
+ 					/* update host status */
+ 					update_host_status(temp_host,FALSE);
  				        }
  
***************
*** 838,843 ****
  						temp_service->state_type=HARD_STATE;
  
! 					/* update service status */
! 					update_service_status(temp_service,FALSE);
  
  					/* ADDED 02/20/08 assume same flapping state if large install tweaks enabled */
--- 843,850 ----
  						temp_service->state_type=HARD_STATE;
  
! 					/* ADDED 01/23/2009 adjust current check attempt if service is in hard problem state (max attempts may have changed in config since restart) */
! 					if(temp_service->current_state!=STATE_OK && temp_service->state_type==HARD_STATE)
! 						temp_service->current_attempt=temp_service->max_attempts;
! 					   
  
  					/* ADDED 02/20/08 assume same flapping state if large install tweaks enabled */
***************
*** 866,869 ****
--- 873,879 ----
  					if(temp_service->last_hard_state_change==(time_t)0)
  						temp_service->last_hard_state_change=temp_service->last_state_change;
+ 
+ 					/* update service status */
+ 					update_service_status(temp_service,FALSE);
  				        }