[Nagios-checkins] nagios/base checks.c, 1.162, 1.163 notifications.c, 1.76, 1.77 utils.c, 1.226, 1.227

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

Update of /cvsroot/nagios/nagios/base
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv27011/base

Modified Files:
	checks.c notifications.c utils.c 
Log Message:
Plenty o' bug fixes

Index: notifications.c
===================================================================
RCS file: /cvsroot/nagios/nagios/base/notifications.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -C2 -d -r1.76 -r1.77
*** notifications.c	28 Feb 2008 19:26:27 -0000	1.76
--- notifications.c	23 Jun 2008 20:47:41 -0000	1.77
***************
*** 4,8 ****
   *
   * Copyright (c) 1999-2008 Ethan Galstad (na...@na...)
!  * Last Modified: 02-26-2008
   *
   * License:
--- 4,8 ----
   *
   * Copyright (c) 1999-2008 Ethan Galstad (na...@na...)
!  * Last Modified: 06-23-2008
   *
   * License:
***************
*** 238,242 ****
  				svc->next_notification=get_next_service_notification_time(svc,current_time);
  
! 				log_debug_info(DEBUGL_NOTIFICATIONS,0,"No contacts were notified.  Next possible notification time: %s",ctime(&svc->next_notification));
  
  				/* update the last notification time for this service (this is needed for rescheduling later notifications) */
--- 238,242 ----
  				svc->next_notification=get_next_service_notification_time(svc,current_time);
  
! 				log_debug_info(DEBUGL_NOTIFICATIONS,0,"%d contacts were notified.  Next possible notification time: %s",contacts_notified,ctime(&svc->next_notification));
  
  				/* update the last notification time for this service (this is needed for rescheduling later notifications) */
***************
*** 252,258 ****
  			        }
  
! 			/* we didn't end up notifying anyone, so adjust current notification number */
! 			else if(increment_notification_number==TRUE)
  				svc->current_notification_number--;
  		        }
  
--- 252,264 ----
  			        }
  
! 			/* we didn't end up notifying anyone */
! 			else if(increment_notification_number==TRUE){
! 
! 				/* adjust current notification number */
  				svc->current_notification_number--;
+ 
+ 				log_debug_info(DEBUGL_NOTIFICATIONS,0,"No contacts were notified.  Next possible notification time: %s",ctime(&svc->next_notification));
+ 				}
+ 
  		        }
  
***************
*** 1124,1129 ****
  				hst->next_host_notification=get_next_host_notification_time(hst,current_time);
  
- 				log_debug_info(DEBUGL_NOTIFICATIONS,0,"No contacts were notified.  Next possible notification time: %s",ctime(&hst->next_host_notification));
- 
  				/* update the last notification time for this host (this is needed for scheduling the next problem notification) */
  				hst->last_host_notification=current_time;
--- 1130,1133 ----
***************
*** 1134,1142 ****
  				else if(hst->current_state==HOST_UNREACHABLE)
  					hst->notified_on_unreachable=TRUE;
  			        }
  
! 			/* we didn't end up notifying anyone, so adjust current notification number */
! 			else if(increment_notification_number==TRUE)
  				hst->current_notification_number--;
  		        }
  
--- 1138,1153 ----
  				else if(hst->current_state==HOST_UNREACHABLE)
  					hst->notified_on_unreachable=TRUE;
+ 
+ 				log_debug_info(DEBUGL_NOTIFICATIONS,0,"%d contacts were notified.  Next possible notification time: %s",contacts_notified,ctime(&hst->next_host_notification));
  			        }
  
! 			/* we didn't end up notifying anyone */
! 			else if(increment_notification_number==TRUE){
! 
! 				/* adjust current notification number */
  				hst->current_notification_number--;
+ 
+ 				log_debug_info(DEBUGL_NOTIFICATIONS,0,"No contacts were notified.  Next possible notification time: %s",ctime(&hst->next_host_notification));
+ 				}
  		        }
  

Index: utils.c
===================================================================
RCS file: /cvsroot/nagios/nagios/base/utils.c,v
retrieving revision 1.226
retrieving revision 1.227
diff -C2 -d -r1.226 -r1.227
*** utils.c	10 Mar 2008 20:58:33 -0000	1.226
--- utils.c	23 Jun 2008 20:47:41 -0000	1.227
***************
*** 4,8 ****
   *
   * Copyright (c) 1999-2008 Ethan Galstad (na...@na...)
!  * Last Modified: 03-10-2008
   *
   * License:
--- 4,8 ----
   *
   * Copyright (c) 1999-2008 Ethan Galstad (na...@na...)
!  * Last Modified: 06-23-2008
   *
   * License:
***************
*** 1524,1528 ****
  		t.tm_mon=month;
  		t.tm_year=year;
! 		t.tm_mday+=(monthday<-30)?-30:monthday;
  		midnight=mktime(&t);
  
--- 1524,1529 ----
  		t.tm_mon=month;
  		t.tm_year=year;
! 		/* -1 means last day of month, so add one to to make this correct - Mike Bird */
! 		t.tm_mday+=(monthday<-30)?-30:monthday+1;
  		midnight=mktime(&t);
  

Index: checks.c
===================================================================
RCS file: /cvsroot/nagios/nagios/base/checks.c,v
retrieving revision 1.162
retrieving revision 1.163
diff -C2 -d -r1.162 -r1.163
*** checks.c	13 Apr 2008 18:34:26 -0000	1.162
--- checks.c	23 Jun 2008 20:47:40 -0000	1.163
***************
*** 4,8 ****
   *
   * Copyright (c) 1999-2008 Ethan Galstad (na...@na...)
!  * Last Modified: 04-13-2008
   *
   * License:
--- 4,8 ----
   *
   * Copyright (c) 1999-2008 Ethan Galstad (na...@na...)
!  * Last Modified: 06-23-2008
   *
   * License:
***************
*** 2292,2295 ****
--- 2292,2299 ----
  	for(temp_host=host_list;temp_host!=NULL;temp_host=temp_host->next){
  
+ 		/* skip hosts that don't have a set check interval (on-demand checks are missed by the orphan logic) */
+ 		if(temp_host->next_check==(time_t)0L)
+ 			continue;
+ 
  		/* skip hosts that are not currently executing */
  		if(temp_host->is_executing==FALSE)
***************
*** 2910,2913 ****
--- 2914,2922 ----
  	gettimeofday(&start_time,NULL);
  
+ 	/* set check time for on-demand checks, so they're not incorrectly detected as being orphaned - Luke Ross 5/16/08 */
+ 	/* NOTE: 06/23/08 EG not sure if there will be side effects to this or not.... */
+ 	if(scheduled_check==FALSE)
+ 		hst->next_check=start_time.tv_sec;
+ 
  	/* increment number of host checks that are currently running... */
  	currently_running_host_checks++;
***************
*** 3073,3077 ****
  			        }
  			else{
! 				check_result_info.return_code=WEXITSTATUS(pclose_result);
  			        }
  
--- 3082,3089 ----
  			        }
  			else{
! 				if(WEXITSTATUS(pclose_result)==0 && WIFSIGNALED(pclose_result))
! 					check_result_info.return_code=128+WTERMSIG(pclose_result);
! 				else
! 					check_result_info.return_code=WEXITSTATUS(pclose_result);
  			        }