[Nagios-checkins] nagios/base checks.c, 1.94, 1.95 utils.c, 1.131, 1.132

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

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

Modified Files:
	checks.c utils.c 
Log Message:
Faster shutdown/restart during host checks, lock file no longer removed prematurely

Index: checks.c
===================================================================
RCS file: /cvsroot/nagios/nagios/base/checks.c,v
retrieving revision 1.94
retrieving revision 1.95
diff -C2 -d -r1.94 -r1.95
*** checks.c	5 Apr 2006 22:28:42 -0000	1.94
--- checks.c	21 Jun 2006 01:00:09 -0000	1.95
***************
*** 39,42 ****
--- 39,45 ----
  #endif
  
+ extern int      sigshutdown;
+ extern int      sigrestart;
+ 
  extern char     *temp_file;
  extern char     *temp_path;
***************
*** 1928,1931 ****
--- 1931,1939 ----
  #endif
  
+ 	/* ADDED 06/20/2006 EG */
+ 	/* bail out if signal encountered */
+ 	if(sigrestart==TRUE || sigshutdown==TRUE)
+ 		return hst->current_state;
+ 
  	/* high resolution time for broker */
  	gettimeofday(&start_time,NULL);
***************
*** 1974,1977 ****
--- 1982,1995 ----
  		for(hst->current_attempt=1;hst->current_attempt<=max_check_attempts;hst->current_attempt++){
  			
+ 			/* ADDED 06/20/2006 EG */
+ 			/* bail out if signal encountered - use old state */
+ 			if(sigrestart==TRUE || sigshutdown==TRUE){
+ 				hst->current_attempt=1;
+ 				hst->current_state=old_state;
+ 				free(hst->plugin_output);
+ 				hst->plugin_output=(char *)old_plugin_output;
+ 				return hst->current_state;
+ 				}
+ 
  			/* check the host */
  			result=run_host_check(hst,check_options);
***************
*** 2060,2063 ****
--- 2078,2091 ----
  		for(hst->current_attempt=1;hst->current_attempt<=hst->max_attempts;hst->current_attempt++){
  
+ 			/* ADDED 06/20/2006 EG */
+ 			/* bail out if signal encountered - use old state */
+ 			if(sigrestart==TRUE || sigshutdown==TRUE){
+ 				hst->current_attempt=1;
+ 				hst->current_state=old_state;
+ 				free(hst->plugin_output);
+ 				hst->plugin_output=(char *)old_plugin_output;
+ 				return hst->current_state;
+ 				}
+ 
  			/* run the host check */
  			result=run_host_check(hst,check_options);

Index: utils.c
===================================================================
RCS file: /cvsroot/nagios/nagios/base/utils.c,v
retrieving revision 1.131
retrieving revision 1.132
diff -C2 -d -r1.131 -r1.132
*** utils.c	20 May 2006 18:36:54 -0000	1.131
--- utils.c	21 Jun 2006 01:00:09 -0000	1.132
***************
*** 4,8 ****
   *
   * Copyright (c) 1999-2006 Ethan Galstad (na...@na...)
!  * Last Modified:   05-20-2006
   *
   * License:
--- 4,8 ----
   *
   * Copyright (c) 1999-2006 Ethan Galstad (na...@na...)
!  * Last Modified:   06-20-2006
   *
   * License:
***************
*** 3254,3260 ****
--- 3254,3262 ----
  
  
+ #ifdef REMOVED_06202006
  	/* if shutdown is already true, we're in a signal trap loop! */
  	if(sigshutdown==TRUE)
  		exit(ERROR);
+ #endif
  
  	if(sig<0)
***************
*** 3289,3299 ****
  #endif
  		my_free((void **)&temp_buffer);
- 
- 		/* remove the lock file if we're in daemon mode */
- 		if(daemon_mode==TRUE)
- 			unlink(lock_file);
- 
- 		/* close and delete the external command file FIFO */
- 		close_command_file();
  	        }
  
--- 3291,3294 ----