[Nagios-checkins] SF.net SVN: nagios:[2046] nagioscore/trunk

ageric at users.sourceforge.net ageric at users.sourceforge.net
Thu Aug 2 00:49:08 UTC 2012


Revision: 2046
          http://nagios.svn.sourceforge.net/nagios/?rev=2046&view=rev
Author:   ageric
Date:     2012-08-02 00:49:08 +0000 (Thu, 02 Aug 2012)
Log Message:
-----------
Retire periodic command checking

Since commands are always processed immediately upon arrival since
the inception of the command file worker thread, there's really no
need to maintain variables that never get filled.

This commit was intended to be squashed with the previous one first,
but since it's so large on its own I'll leave it as-is.

In essence, we remove the two global variables "command_check_interval"
and "last_command_check_time", and all code affected by that removal,
as well as example configurations and test-data.

Signed-off-by: Andreas Ericsson <ae at op5.se>

Modified Paths:
--------------
    nagioscore/trunk/base/broker.c
    nagioscore/trunk/base/checks.c
    nagioscore/trunk/base/commands.c
    nagioscore/trunk/base/config.c
    nagioscore/trunk/base/events.c
    nagioscore/trunk/base/nagios.c
    nagioscore/trunk/base/nagiostats.c
    nagioscore/trunk/base/utils.c
    nagioscore/trunk/cgi/cgiutils.c
    nagioscore/trunk/cgi/extinfo.c
    nagioscore/trunk/include/nagios.h
    nagioscore/trunk/include/nebstructs.h
    nagioscore/trunk/sample-config/nagios.cfg.in
    nagioscore/trunk/t/etc/nagios-empty-groups.cfg
    nagioscore/trunk/t/etc/nagios-hosturgencies.cfg
    nagioscore/trunk/t/etc/nagios-no-contactgroup.cfg
    nagioscore/trunk/t/etc/nagios-no-service.cfg
    nagioscore/trunk/t/etc/nagios-no-status.cfg
    nagioscore/trunk/t/etc/nagios-with-generated-status.cfg
    nagioscore/trunk/t/etc/nagios.cfg
    nagioscore/trunk/t/var/status-hosturgencies.dat
    nagioscore/trunk/t/var/status.dat
    nagioscore/trunk/t-tap/smallconfig/nagios.cfg
    nagioscore/trunk/t-tap/test-stubs.c
    nagioscore/trunk/t-tap/test_commands.c
    nagioscore/trunk/t-tap/test_events.c
    nagioscore/trunk/t-tap/test_nagios_config.c
    nagioscore/trunk/t-tap/test_timeperiods.c
    nagioscore/trunk/xdata/xsddefault.c

Modified: nagioscore/trunk/base/broker.c
===================================================================
--- nagioscore/trunk/base/broker.c	2012-08-02 00:48:03 UTC (rev 2045)
+++ nagioscore/trunk/base/broker.c	2012-08-02 00:49:08 UTC (rev 2046)
@@ -37,7 +37,6 @@
 extern time_t program_start;
 extern int nagios_pid;
 extern int daemon_mode;
-extern time_t last_command_check;
 extern time_t last_log_rotation;
 extern int enable_notifications;
 extern int execute_service_checks;
@@ -488,7 +487,6 @@
 	ds.program_start = program_start;
 	ds.pid = nagios_pid;
 	ds.daemon_mode = daemon_mode;
-	ds.last_command_check = last_command_check;
 	ds.last_log_rotation = last_log_rotation;
 	ds.notifications_enabled = enable_notifications;
 	ds.active_service_checks_enabled = execute_service_checks;

Modified: nagioscore/trunk/base/checks.c
===================================================================
--- nagioscore/trunk/base/checks.c	2012-08-02 00:48:03 UTC (rev 2045)
+++ nagioscore/trunk/base/checks.c	2012-08-02 00:49:08 UTC (rev 2046)
@@ -51,8 +51,6 @@
 
 extern int      interval_length;
 
-extern int      command_check_interval;
-
 extern int      log_initial_states;
 extern int      log_passive_checks;
 extern int      log_host_retries;

Modified: nagioscore/trunk/base/commands.c
===================================================================
--- nagioscore/trunk/base/commands.c	2012-08-02 00:48:03 UTC (rev 2045)
+++ nagioscore/trunk/base/commands.c	2012-08-02 00:49:08 UTC (rev 2046)
@@ -45,11 +45,8 @@
 
 extern int      ipc_pipe[2];
 
-extern time_t   last_command_check;
 extern time_t   last_command_status_update;
 
-extern int      command_check_interval;
-
 extern int      enable_notifications;
 extern int      execute_service_checks;
 extern int      accept_passive_service_checks;
@@ -84,92 +81,17 @@
 passive_check_result    *passive_check_result_list_tail = NULL;
 
 extern pthread_t       worker_threads[TOTAL_WORKER_THREADS];
-extern circular_buffer external_command_buffer;
-extern int             external_command_buffer_slots;
 
-
-
 /******************************************************************/
 /****************** EXTERNAL COMMAND PROCESSING *******************/
 /******************************************************************/
 
 
-/* checks for the existence of the external command file and processes all commands found in it */
-int check_for_external_commands(void) {
-	char *buffer = NULL;
-	int update_status = FALSE;
-
-	log_debug_info(DEBUGL_FUNCTIONS, 0, "check_for_external_commands()\n");
-
-	/* bail out if we shouldn't be checking for external commands */
-	if(check_external_commands == FALSE)
-		return ERROR;
-
-	/* update last command check time */
-	last_command_check = time(NULL);
-
-	/* update the status log with new program information */
-	/* go easy on the frequency of this if we're checking often - only update program status every 10 seconds.... */
-	if(last_command_check < (last_command_status_update + 10))
-		update_status = FALSE;
-	else
-		update_status = TRUE;
-	if(update_status == TRUE) {
-		last_command_status_update = last_command_check;
-		update_program_status(FALSE);
-		}
-
-	/* reset passive check result list pointers */
-	passive_check_result_list = NULL;
-	passive_check_result_list_tail = NULL;
-
-	/* process all commands found in the buffer */
-	while(1) {
-
-		/* get a lock on the buffer */
-		pthread_mutex_lock(&external_command_buffer.buffer_lock);
-
-		/* if no items present, bail out */
-		if(external_command_buffer.items <= 0) {
-			pthread_mutex_unlock(&external_command_buffer.buffer_lock);
-			break;
-			}
-
-		if(external_command_buffer.buffer[external_command_buffer.tail])
-			buffer = strdup(((char **)external_command_buffer.buffer)[external_command_buffer.tail]);
-
-		/* free memory allocated for buffer slot */
-		my_free(((char **)external_command_buffer.buffer)[external_command_buffer.tail]);
-
-		/* adjust tail counter and number of items */
-		external_command_buffer.tail = (external_command_buffer.tail + 1) % external_command_buffer_slots;
-		external_command_buffer.items--;
-
-		/* release the lock on the buffer */
-		pthread_mutex_unlock(&external_command_buffer.buffer_lock);
-
-		/* process the command */
-		process_external_command1(buffer);
-
-		/* free memory */
-		my_free(buffer);
-		}
-
-	/**** PROCESS ALL PASSIVE HOST AND SERVICE CHECK RESULTS AT ONE TIME ****/
-	if(passive_check_result_list != NULL)
-		process_passive_checks();
-
-	return OK;
-	}
-
-
-
 /* processes all external commands in a (regular) file */
 int process_external_commands_from_file(char *fname, int delete_file) {
 	mmapfile *thefile = NULL;
 	char *input = NULL;
 
-
 	log_debug_info(DEBUGL_FUNCTIONS, 0, "process_external_commands_from_file()\n");
 
 	if(fname == NULL)

Modified: nagioscore/trunk/base/config.c
===================================================================
--- nagioscore/trunk/base/config.c	2012-08-02 00:48:03 UTC (rev 2045)
+++ nagioscore/trunk/base/config.c	2012-08-02 00:49:08 UTC (rev 2046)
@@ -103,7 +103,6 @@
 
 extern int      max_parallel_service_checks;
 
-extern int      command_check_interval;
 extern int      check_reaper_interval;
 extern int      max_check_reaper_time;
 extern int      service_freshness_check_interval;
@@ -199,8 +198,6 @@
 extern host		**host_hashlist;
 extern service		**service_hashlist;
 
-extern int              external_command_buffer_slots;
-
 extern unsigned long    max_check_result_file_age;
 
 extern char             *debug_file;
@@ -259,7 +256,6 @@
 	mmapfile *thefile = NULL;
 	int current_line = 0;
 	int error = FALSE;
-	int command_check_interval_is_seconds = FALSE;
 	char *modptr = NULL;
 	char *argptr = NULL;
 	DIR *tmpdir = NULL;
@@ -1013,15 +1009,9 @@
 			check_external_commands = (atoi(value) > 0) ? TRUE : FALSE;
 			}
 
+		/* @todo Remove before Nagios 4.3 */
 		else if(!strcmp(variable, "command_check_interval")) {
-
-			command_check_interval_is_seconds = (strstr(value, "s")) ? TRUE : FALSE;
-			command_check_interval = atoi(value);
-			if(command_check_interval < -1 || command_check_interval == 0) {
-				asprintf(&error_message, "Illegal value for command_check_interval");
-				error = TRUE;
-				break;
-				}
+			obsoleted_warning(variable, "Commands are always handled on arrival");
 			}
 
 		else if(!strcmp(variable, "check_for_orphaned_services")) {
@@ -1283,8 +1273,9 @@
 		else if(!strcmp(variable, "p1_file"))
 			obsoleted_warning(variable, NULL);
 
+		/*** as is external_command_buffer_slots */
 		else if(!strcmp(variable, "external_command_buffer_slots"))
-			external_command_buffer_slots = atoi(value);
+			obsoleted_warning(variable, "All commands are always processed upon arrival");
 
 		else if(!strcmp(variable, "check_for_updates"))
 			check_for_updates = (atoi(value) > 0) ? TRUE : FALSE;
@@ -1339,10 +1330,6 @@
 		set_environment_var("TZ", use_timezone, 1);
 	tzset();
 
-	/* adjust command check interval */
-	if(command_check_interval_is_seconds == FALSE && command_check_interval != -1)
-		command_check_interval *= interval_length;
-
 	/* adjust tweaks */
 	if(free_child_process_memory == -1)
 		free_child_process_memory = (use_large_installation_tweaks == TRUE) ? FALSE : TRUE;

Modified: nagioscore/trunk/base/events.c
===================================================================
--- nagioscore/trunk/base/events.c	2012-08-02 00:48:03 UTC (rev 2045)
+++ nagioscore/trunk/base/events.c	2012-08-02 00:49:08 UTC (rev 2046)
@@ -39,7 +39,6 @@
 
 extern time_t   program_start;
 extern time_t   event_start;
-extern time_t   last_command_check;
 
 extern int      sigshutdown;
 extern int      sigrestart;
@@ -52,7 +51,6 @@
 extern int      max_host_check_spread;
 extern int      max_service_check_spread;
 
-extern int      command_check_interval;
 extern int      check_reaper_interval;
 extern int      service_freshness_check_interval;
 extern int      host_freshness_check_interval;
@@ -106,7 +104,6 @@
 	host *temp_host = NULL;
 	service *temp_service = NULL;
 	time_t current_time = 0L;
-	unsigned long interval_to_use = 0L;
 	int total_interleave_blocks = 0;
 	int current_interleave_block = 1;
 	int interleave_block_index = 0;
@@ -582,15 +579,6 @@
 	if(aggregate_status_updates == TRUE)
 		schedule_new_event(EVENT_STATUS_SAVE, TRUE, current_time + status_update_interval, TRUE, status_update_interval, NULL, TRUE, NULL, NULL, 0);
 
-	/* add an external command check event if needed */
-	if(check_external_commands == TRUE) {
-		if(command_check_interval == -1)
-			interval_to_use = (unsigned long)5;
-		else
-			interval_to_use = (unsigned long)command_check_interval;
-		schedule_new_event(EVENT_COMMAND_CHECK, TRUE, current_time + interval_to_use, TRUE, interval_to_use, NULL, TRUE, NULL, NULL, 0);
-		}
-
 	/* add a log rotation event if necessary */
 	if(log_rotation_method != LOG_ROTATION_NONE)
 		schedule_new_event(EVENT_LOG_ROTATION, TRUE, get_next_log_rotation_time(), TRUE, 0, (void *)get_next_log_rotation_time, TRUE, NULL, NULL, 0);
@@ -916,10 +904,6 @@
 		last_time = current_time;
 
 		/* super-priority (hardcoded) events come first */
-		/* check for external commands if we're supposed to check as often as possible */
-		if(command_check_interval == -1)
-			check_for_external_commands();
-
 		/* update status information occassionally - NagVis watches the NDOUtils DB to see if Nagios is alive */
 		if((unsigned long)(current_time - last_status_update) > 5) {
 			last_status_update = current_time;
@@ -1156,14 +1140,6 @@
 			perform_scheduled_host_check(temp_host, event->event_options, latency);
 			break;
 
-		case EVENT_COMMAND_CHECK:
-
-			log_debug_info(DEBUGL_EVENTS, 0, "** External Command Check Event\n");
-
-			/* check for external commands */
-			check_for_external_commands();
-			break;
-
 		case EVENT_LOG_ROTATION:
 
 			log_debug_info(DEBUGL_EVENTS, 0, "** Log File Rotation Event\n");
@@ -1431,7 +1407,6 @@
 	/* adjust program timestamps */
 	adjust_timestamp_for_time_change(last_time, current_time, time_difference, &program_start);
 	adjust_timestamp_for_time_change(last_time, current_time, time_difference, &event_start);
-	adjust_timestamp_for_time_change(last_time, current_time, time_difference, &last_command_check);
 
 	/* update the status data */
 	update_program_status(FALSE);

Modified: nagioscore/trunk/base/nagios.c
===================================================================
--- nagioscore/trunk/base/nagios.c	2012-08-02 00:48:03 UTC (rev 2045)
+++ nagioscore/trunk/base/nagios.c	2012-08-02 00:49:08 UTC (rev 2046)
@@ -112,7 +112,6 @@
 int             max_host_check_spread = DEFAULT_HOST_CHECK_SPREAD;
 int             max_service_check_spread = DEFAULT_SERVICE_CHECK_SPREAD;
 
-int             command_check_interval = DEFAULT_COMMAND_CHECK_INTERVAL;
 int             check_reaper_interval = DEFAULT_CHECK_REAPER_INTERVAL;
 int             max_check_reaper_time = DEFAULT_MAX_REAPER_TIME;
 int             service_freshness_check_interval = DEFAULT_FRESHNESS_CHECK_INTERVAL;
@@ -137,7 +136,6 @@
 char            *last_program_version = NULL;
 char            *new_program_version = NULL;
 
-time_t          last_command_check = 0L;
 time_t          last_command_status_update = 0L;
 time_t          last_log_rotation = 0L;
 time_t          last_program_stop = 0L;
@@ -255,10 +253,8 @@
 
 dbuf            check_result_dbuf;
 
-circular_buffer external_command_buffer;
 circular_buffer check_result_buffer;
 pthread_t       worker_threads[TOTAL_WORKER_THREADS];
-int             external_command_buffer_slots = DEFAULT_EXTERNAL_COMMAND_BUFFER_SLOTS;
 
 check_stats     check_statistics[MAX_CHECK_STATS_TYPES];
 

Modified: nagioscore/trunk/base/nagiostats.c
===================================================================
--- nagioscore/trunk/base/nagiostats.c	2012-08-02 00:48:03 UTC (rev 2045)
+++ nagioscore/trunk/base/nagiostats.c	2012-08-02 00:49:08 UTC (rev 2046)
@@ -193,12 +193,6 @@
 int external_commands_last_5min = 0;
 int external_commands_last_15min = 0;
 
-int total_external_command_buffer_slots = 0;
-int used_external_command_buffer_slots = 0;
-int high_external_command_buffer_slots = 0;
-
-
-
 int display_mrtg_values(void);
 int display_stats(void);
 int read_config_file(void);
@@ -469,13 +463,6 @@
 			printf("Nagios %s (pid=%lu)%s", status_version, nagios_pid, mrtg_delimiter);
 
 
-		else if(!strcmp(temp_ptr, "TOTCMDBUF"))
-			printf("%d%s", total_external_command_buffer_slots, mrtg_delimiter);
-		else if(!strcmp(temp_ptr, "USEDCMDBUF"))
-			printf("%d%s", used_external_command_buffer_slots, mrtg_delimiter);
-		else if(!strcmp(temp_ptr, "HIGHCMDBUF"))
-			printf("%d%s", high_external_command_buffer_slots, mrtg_delimiter);
-
 		else if(!strcmp(temp_ptr, "NUMSERVICES"))
 			printf("%d%s", status_service_entries, mrtg_delimiter);
 		else if(!strcmp(temp_ptr, "NUMHOSTS"))
@@ -777,7 +764,6 @@
 	get_time_breakdown(time_difference, &days, &hours, &minutes, &seconds);
 	printf("Program Running Time:                   %dd %dh %dm %ds\n", days, hours, minutes, seconds);
 	printf("Nagios PID:                             %lu\n", nagios_pid);
-	printf("Used/High/Total Command Buffers:        %d / %d / %d\n", used_external_command_buffer_slots, high_external_command_buffer_slots, total_external_command_buffer_slots);
 	printf("\n");
 	printf("Total Services:                         %d\n", status_service_entries);
 	printf("Services Checked:                       %d\n", services_checked);
@@ -1204,12 +1190,6 @@
 				case STATUS_PROGRAM_DATA:
 					if(!strcmp(var, "program_start"))
 						program_start = strtoul(val, NULL, 10);
-					else if(!strcmp(var, "total_external_command_buffer_slots"))
-						total_external_command_buffer_slots = atoi(val);
-					else if(!strcmp(var, "used_external_command_buffer_slots"))
-						used_external_command_buffer_slots = atoi(val);
-					else if(!strcmp(var, "high_external_command_buffer_slots"))
-						high_external_command_buffer_slots = atoi(val);
 					else if(!strcmp(var, "nagios_pid"))
 						nagios_pid = strtoul(val, NULL, 10);
 					else if(!strcmp(var, "active_scheduled_host_check_stats")) {

Modified: nagioscore/trunk/base/utils.c
===================================================================
--- nagioscore/trunk/base/utils.c	2012-08-02 00:48:03 UTC (rev 2045)
+++ nagioscore/trunk/base/utils.c	2012-08-02 00:49:08 UTC (rev 2046)
@@ -175,7 +175,6 @@
 
 extern time_t   program_start;
 
-extern time_t   last_command_check;
 extern time_t	last_command_status_update;
 extern time_t   last_log_rotation;
 
@@ -254,10 +253,8 @@
 extern dbuf            check_result_dbuf;
 
 extern pthread_t       worker_threads[TOTAL_WORKER_THREADS];
-extern circular_buffer external_command_buffer;
 extern circular_buffer check_result_buffer;
 extern circular_buffer event_broker_buffer;
-extern int             external_command_buffer_slots;
 
 extern check_stats     check_statistics[MAX_CHECK_STATS_TYPES];
 
@@ -3566,7 +3563,6 @@
 	retained_contact_host_attribute_mask = 0L;
 	retained_contact_service_attribute_mask = 0L;
 
-	command_check_interval = DEFAULT_COMMAND_CHECK_INTERVAL;
 	check_reaper_interval = DEFAULT_CHECK_REAPER_INTERVAL;
 	max_check_reaper_time = DEFAULT_MAX_REAPER_TIME;
 	max_check_result_file_age = DEFAULT_MAX_CHECK_RESULT_AGE;
@@ -3584,7 +3580,6 @@
 
 	log_rotation_method = LOG_ROTATION_NONE;
 
-	last_command_check = 0L;
 	last_command_status_update = 0L;
 	last_log_rotation = 0L;
 
@@ -3631,8 +3626,6 @@
 
 	additional_freshness_latency = DEFAULT_ADDITIONAL_FRESHNESS_LATENCY;
 
-	external_command_buffer_slots = DEFAULT_EXTERNAL_COMMAND_BUFFER_SLOTS;
-
 	debug_level = DEFAULT_DEBUG_LEVEL;
 	debug_verbosity = DEFAULT_DEBUG_VERBOSITY;
 	max_debug_file_size = DEFAULT_MAX_DEBUG_FILE_SIZE;

Modified: nagioscore/trunk/cgi/cgiutils.c
===================================================================
--- nagioscore/trunk/cgi/cgiutils.c	2012-08-02 00:48:03 UTC (rev 2045)
+++ nagioscore/trunk/cgi/cgiutils.c	2012-08-02 00:49:08 UTC (rev 2046)
@@ -81,7 +81,6 @@
 extern int      obsess_over_services;
 extern int      enable_failure_prediction;
 extern int      process_performance_data;
-extern time_t   last_command_check;
 extern time_t   last_log_rotation;
 
 int             check_external_commands = 0;

Modified: nagioscore/trunk/cgi/extinfo.c
===================================================================
--- nagioscore/trunk/cgi/extinfo.c	2012-08-02 00:48:03 UTC (rev 2045)
+++ nagioscore/trunk/cgi/extinfo.c	2012-08-02 00:49:08 UTC (rev 2046)
@@ -43,7 +43,6 @@
 extern time_t		program_start;
 extern int              nagios_pid;
 extern int              daemon_mode;
-extern time_t           last_command_check;
 extern time_t           last_log_rotation;
 extern int              enable_notifications;
 extern int              execute_service_checks;
@@ -824,10 +823,6 @@
 	sprintf(run_time_string, "%dd %dh %dm %ds", days, hours, minutes, seconds);
 	printf("<TR><TD CLASS='dataVar'>Total Running Time:</TD><TD CLASS='dataVal'>%s</TD></TR>\n", run_time_string);
 
-	/* last external check */
-	get_time_string(&last_command_check, date_time, (int)sizeof(date_time), SHORT_DATE_TIME);
-	printf("<TR><TD CLASS='dataVar'>Last External Command Check:</TD><TD CLASS='dataVal'>%s</TD></TR>\n", (last_command_check == (time_t)0) ? "N/A" : date_time);
-
 	/* last log file rotation */
 	get_time_string(&last_log_rotation, date_time, (int)sizeof(date_time), SHORT_DATE_TIME);
 	printf("<TR><TD CLASS='dataVar'>Last Log File Rotation:</TD><TD CLASS='dataVal'>%s</TD></TR>\n", (last_log_rotation == (time_t)0) ? "N/A" : date_time);

Modified: nagioscore/trunk/include/nagios.h
===================================================================
--- nagioscore/trunk/include/nagios.h	2012-08-02 00:48:03 UTC (rev 2045)
+++ nagioscore/trunk/include/nagios.h	2012-08-02 00:49:08 UTC (rev 2046)
@@ -61,7 +61,6 @@
 #define DEFAULT_SLEEP_TIME      				0.5    	/* seconds between event run checks */
 #define DEFAULT_INTERVAL_LENGTH 				60     	/* seconds per interval unit for check scheduling */
 #define DEFAULT_RETRY_INTERVAL  				30	/* services are retried in 30 seconds if they're not OK */
-#define DEFAULT_COMMAND_CHECK_INTERVAL				-1	/* interval to check for external commands (default = as often as possible) */
 #define DEFAULT_CHECK_REAPER_INTERVAL				10	/* interval in seconds to reap host and service check results */
 #define DEFAULT_MAX_REAPER_TIME                 		30      /* maximum number of seconds to spend reaping service checks before we break out for a while */
 #define DEFAULT_MAX_CHECK_RESULT_AGE				3600    /* maximum number of seconds that a check result file is considered to be valid */
@@ -396,9 +395,6 @@
 
 /******************* THREAD STUFF ********************/
 
-	/* slots in circular buffers */
-#define DEFAULT_EXTERNAL_COMMAND_BUFFER_SLOTS     4096
-
 	/* worker threads */
 #define TOTAL_WORKER_THREADS              1
 
@@ -597,7 +593,6 @@
 
 
 /**** External Command Functions ****/
-int check_for_external_commands(void);			/* checks for any external commands */
 int process_external_command1(char *);                  /* top-level external command processor */
 int process_external_command2(int, time_t, char *);	/* process an external command */
 int process_external_commands_from_file(char *, int);   /* process external commands in a file */

Modified: nagioscore/trunk/include/nebstructs.h
===================================================================
--- nagioscore/trunk/include/nebstructs.h	2012-08-02 00:48:03 UTC (rev 2045)
+++ nagioscore/trunk/include/nebstructs.h	2012-08-02 00:49:08 UTC (rev 2046)
@@ -256,7 +256,6 @@
 	time_t          program_start;
 	int             pid;
 	int             daemon_mode;
-	time_t          last_command_check;
 	time_t          last_log_rotation;
 	int             notifications_enabled;
 	int             active_service_checks_enabled;

Modified: nagioscore/trunk/sample-config/nagios.cfg.in
===================================================================
--- nagioscore/trunk/sample-config/nagios.cfg.in	2012-08-02 00:48:03 UTC (rev 2045)
+++ nagioscore/trunk/sample-config/nagios.cfg.in	2012-08-02 00:49:08 UTC (rev 2046)
@@ -144,24 +144,6 @@
 
 
 
-# EXTERNAL COMMAND CHECK INTERVAL
-# This is the interval at which Nagios should check for external commands.
-# This value works of the interval_length you specify later.  If you leave
-# that at its default value of 60 (seconds), a value of 1 here will cause
-# Nagios to check for external commands every minute.  If you specify a
-# number followed by an "s" (i.e. 15s), this will be interpreted to mean
-# actual seconds rather than a multiple of the interval_length variable.
-# Note: In addition to reading the external command file at regularly 
-# scheduled intervals, Nagios will also check for external commands after
-# event handlers are executed.
-# NOTE: Setting this value to -1 causes Nagios to check the external
-# command file as often as possible.
-
-#command_check_interval=15s
-command_check_interval=-1
-
-
-
 # EXTERNAL COMMAND FILE
 # This is the file that Nagios checks for external command requests.
 # It is also where the command CGI will write commands that are submitted
@@ -173,17 +155,6 @@
 command_file=@localstatedir@/rw/nagios.cmd
 
 
-
-# EXTERNAL COMMAND BUFFER SLOTS
-# This settings is used to tweak the number of items or "slots" that
-# the Nagios daemon should allocate to the buffer that holds incoming 
-# external commands before they are processed.  As external commands 
-# are processed by the daemon, they are removed from the buffer.  
-
-external_command_buffer_slots=4096
-
-
-
 # LOCK FILE
 # This is the lockfile that Nagios will use to store its PID number
 # in when it is running in daemon mode.

Modified: nagioscore/trunk/t/etc/nagios-empty-groups.cfg
===================================================================
--- nagioscore/trunk/t/etc/nagios-empty-groups.cfg	2012-08-02 00:48:03 UTC (rev 2045)
+++ nagioscore/trunk/t/etc/nagios-empty-groups.cfg	2012-08-02 00:49:08 UTC (rev 2046)
@@ -129,24 +129,6 @@
 
 
 
-# EXTERNAL COMMAND CHECK INTERVAL
-# This is the interval at which Nagios should check for external commands.
-# This value works of the interval_length you specify later.  If you leave
-# that at its default value of 60 (seconds), a value of 1 here will cause
-# Nagios to check for external commands every minute.  If you specify a
-# number followed by an "s" (i.e. 15s), this will be interpreted to mean
-# actual seconds rather than a multiple of the interval_length variable.
-# Note: In addition to reading the external command file at regularly 
-# scheduled intervals, Nagios will also check for external commands after
-# event handlers are executed.
-# NOTE: Setting this value to -1 causes Nagios to check the external
-# command file as often as possible.
-
-#command_check_interval=15s
-command_check_interval=-1
-
-
-
 # EXTERNAL COMMAND FILE
 # This is the file that Nagios checks for external command requests.
 # It is also where the command CGI will write commands that are submitted
@@ -159,16 +141,6 @@
 
 
 
-# EXTERNAL COMMAND BUFFER SLOTS
-# This settings is used to tweak the number of items or "slots" that
-# the Nagios daemon should allocate to the buffer that holds incoming 
-# external commands before they are processed.  As external commands 
-# are processed by the daemon, they are removed from the buffer.  
-
-external_command_buffer_slots=4096
-
-
-
 # LOCK FILE
 # This is the lockfile that Nagios will use to store its PID number
 # in when it is running in daemon mode.

Modified: nagioscore/trunk/t/etc/nagios-hosturgencies.cfg
===================================================================
--- nagioscore/trunk/t/etc/nagios-hosturgencies.cfg	2012-08-02 00:48:03 UTC (rev 2045)
+++ nagioscore/trunk/t/etc/nagios-hosturgencies.cfg	2012-08-02 00:49:08 UTC (rev 2046)
@@ -129,24 +129,6 @@
 
 
 
-# EXTERNAL COMMAND CHECK INTERVAL
-# This is the interval at which Nagios should check for external commands.
-# This value works of the interval_length you specify later.  If you leave
-# that at its default value of 60 (seconds), a value of 1 here will cause
-# Nagios to check for external commands every minute.  If you specify a
-# number followed by an "s" (i.e. 15s), this will be interpreted to mean
-# actual seconds rather than a multiple of the interval_length variable.
-# Note: In addition to reading the external command file at regularly 
-# scheduled intervals, Nagios will also check for external commands after
-# event handlers are executed.
-# NOTE: Setting this value to -1 causes Nagios to check the external
-# command file as often as possible.
-
-#command_check_interval=15s
-command_check_interval=-1
-
-
-
 # EXTERNAL COMMAND FILE
 # This is the file that Nagios checks for external command requests.
 # It is also where the command CGI will write commands that are submitted
@@ -159,16 +141,6 @@
 
 
 
-# EXTERNAL COMMAND BUFFER SLOTS
-# This settings is used to tweak the number of items or "slots" that
-# the Nagios daemon should allocate to the buffer that holds incoming 
-# external commands before they are processed.  As external commands 
-# are processed by the daemon, they are removed from the buffer.  
-
-external_command_buffer_slots=4096
-
-
-
 # LOCK FILE
 # This is the lockfile that Nagios will use to store its PID number
 # in when it is running in daemon mode.

Modified: nagioscore/trunk/t/etc/nagios-no-contactgroup.cfg
===================================================================
--- nagioscore/trunk/t/etc/nagios-no-contactgroup.cfg	2012-08-02 00:48:03 UTC (rev 2045)
+++ nagioscore/trunk/t/etc/nagios-no-contactgroup.cfg	2012-08-02 00:49:08 UTC (rev 2046)
@@ -129,24 +129,6 @@
 
 
 
-# EXTERNAL COMMAND CHECK INTERVAL
-# This is the interval at which Nagios should check for external commands.
-# This value works of the interval_length you specify later.  If you leave
-# that at its default value of 60 (seconds), a value of 1 here will cause
-# Nagios to check for external commands every minute.  If you specify a
-# number followed by an "s" (i.e. 15s), this will be interpreted to mean
-# actual seconds rather than a multiple of the interval_length variable.
-# Note: In addition to reading the external command file at regularly 
-# scheduled intervals, Nagios will also check for external commands after
-# event handlers are executed.
-# NOTE: Setting this value to -1 causes Nagios to check the external
-# command file as often as possible.
-
-#command_check_interval=15s
-command_check_interval=-1
-
-
-
 # EXTERNAL COMMAND FILE
 # This is the file that Nagios checks for external command requests.
 # It is also where the command CGI will write commands that are submitted
@@ -159,16 +141,6 @@
 
 
 
-# EXTERNAL COMMAND BUFFER SLOTS
-# This settings is used to tweak the number of items or "slots" that
-# the Nagios daemon should allocate to the buffer that holds incoming 
-# external commands before they are processed.  As external commands 
-# are processed by the daemon, they are removed from the buffer.  
-
-external_command_buffer_slots=4096
-
-
-
 # LOCK FILE
 # This is the lockfile that Nagios will use to store its PID number
 # in when it is running in daemon mode.

Modified: nagioscore/trunk/t/etc/nagios-no-service.cfg
===================================================================
--- nagioscore/trunk/t/etc/nagios-no-service.cfg	2012-08-02 00:48:03 UTC (rev 2045)
+++ nagioscore/trunk/t/etc/nagios-no-service.cfg	2012-08-02 00:49:08 UTC (rev 2046)
@@ -129,24 +129,6 @@
 
 
 
-# EXTERNAL COMMAND CHECK INTERVAL
-# This is the interval at which Nagios should check for external commands.
-# This value works of the interval_length you specify later.  If you leave
-# that at its default value of 60 (seconds), a value of 1 here will cause
-# Nagios to check for external commands every minute.  If you specify a
-# number followed by an "s" (i.e. 15s), this will be interpreted to mean
-# actual seconds rather than a multiple of the interval_length variable.
-# Note: In addition to reading the external command file at regularly 
-# scheduled intervals, Nagios will also check for external commands after
-# event handlers are executed.
-# NOTE: Setting this value to -1 causes Nagios to check the external
-# command file as often as possible.
-
-#command_check_interval=15s
-command_check_interval=-1
-
-
-
 # EXTERNAL COMMAND FILE
 # This is the file that Nagios checks for external command requests.
 # It is also where the command CGI will write commands that are submitted
@@ -159,16 +141,6 @@
 
 
 
-# EXTERNAL COMMAND BUFFER SLOTS
-# This settings is used to tweak the number of items or "slots" that
-# the Nagios daemon should allocate to the buffer that holds incoming 
-# external commands before they are processed.  As external commands 
-# are processed by the daemon, they are removed from the buffer.  
-
-external_command_buffer_slots=4096
-
-
-
 # LOCK FILE
 # This is the lockfile that Nagios will use to store its PID number
 # in when it is running in daemon mode.

Modified: nagioscore/trunk/t/etc/nagios-no-status.cfg
===================================================================
--- nagioscore/trunk/t/etc/nagios-no-status.cfg	2012-08-02 00:48:03 UTC (rev 2045)
+++ nagioscore/trunk/t/etc/nagios-no-status.cfg	2012-08-02 00:49:08 UTC (rev 2046)
@@ -129,24 +129,6 @@
 
 
 
-# EXTERNAL COMMAND CHECK INTERVAL
-# This is the interval at which Nagios should check for external commands.
-# This value works of the interval_length you specify later.  If you leave
-# that at its default value of 60 (seconds), a value of 1 here will cause
-# Nagios to check for external commands every minute.  If you specify a
-# number followed by an "s" (i.e. 15s), this will be interpreted to mean
-# actual seconds rather than a multiple of the interval_length variable.
-# Note: In addition to reading the external command file at regularly 
-# scheduled intervals, Nagios will also check for external commands after
-# event handlers are executed.
-# NOTE: Setting this value to -1 causes Nagios to check the external
-# command file as often as possible.
-
-#command_check_interval=15s
-command_check_interval=-1
-
-
-
 # EXTERNAL COMMAND FILE
 # This is the file that Nagios checks for external command requests.
 # It is also where the command CGI will write commands that are submitted
@@ -159,16 +141,6 @@
 
 
 
-# EXTERNAL COMMAND BUFFER SLOTS
-# This settings is used to tweak the number of items or "slots" that
-# the Nagios daemon should allocate to the buffer that holds incoming 
-# external commands before they are processed.  As external commands 
-# are processed by the daemon, they are removed from the buffer.  
-
-external_command_buffer_slots=4096
-
-
-
 # LOCK FILE
 # This is the lockfile that Nagios will use to store its PID number
 # in when it is running in daemon mode.

Modified: nagioscore/trunk/t/etc/nagios-with-generated-status.cfg
===================================================================
--- nagioscore/trunk/t/etc/nagios-with-generated-status.cfg	2012-08-02 00:48:03 UTC (rev 2045)
+++ nagioscore/trunk/t/etc/nagios-with-generated-status.cfg	2012-08-02 00:49:08 UTC (rev 2046)
@@ -129,24 +129,6 @@
 
 
 
-# EXTERNAL COMMAND CHECK INTERVAL
-# This is the interval at which Nagios should check for external commands.
-# This value works of the interval_length you specify later.  If you leave
-# that at its default value of 60 (seconds), a value of 1 here will cause
-# Nagios to check for external commands every minute.  If you specify a
-# number followed by an "s" (i.e. 15s), this will be interpreted to mean
-# actual seconds rather than a multiple of the interval_length variable.
-# Note: In addition to reading the external command file at regularly 
-# scheduled intervals, Nagios will also check for external commands after
-# event handlers are executed.
-# NOTE: Setting this value to -1 causes Nagios to check the external
-# command file as often as possible.
-
-#command_check_interval=15s
-command_check_interval=-1
-
-
-
 # EXTERNAL COMMAND FILE
 # This is the file that Nagios checks for external command requests.
 # It is also where the command CGI will write commands that are submitted
@@ -159,16 +141,6 @@
 
 
 
-# EXTERNAL COMMAND BUFFER SLOTS
-# This settings is used to tweak the number of items or "slots" that
-# the Nagios daemon should allocate to the buffer that holds incoming 
-# external commands before they are processed.  As external commands 
-# are processed by the daemon, they are removed from the buffer.  
-
-external_command_buffer_slots=4096
-
-
-
 # LOCK FILE
 # This is the lockfile that Nagios will use to store its PID number
 # in when it is running in daemon mode.

Modified: nagioscore/trunk/t/etc/nagios.cfg
===================================================================
--- nagioscore/trunk/t/etc/nagios.cfg	2012-08-02 00:48:03 UTC (rev 2045)
+++ nagioscore/trunk/t/etc/nagios.cfg	2012-08-02 00:49:08 UTC (rev 2046)
@@ -129,24 +129,6 @@
 
 
 
-# EXTERNAL COMMAND CHECK INTERVAL
-# This is the interval at which Nagios should check for external commands.
-# This value works of the interval_length you specify later.  If you leave
-# that at its default value of 60 (seconds), a value of 1 here will cause
-# Nagios to check for external commands every minute.  If you specify a
-# number followed by an "s" (i.e. 15s), this will be interpreted to mean
-# actual seconds rather than a multiple of the interval_length variable.
-# Note: In addition to reading the external command file at regularly 
-# scheduled intervals, Nagios will also check for external commands after
-# event handlers are executed.
-# NOTE: Setting this value to -1 causes Nagios to check the external
-# command file as often as possible.
-
-#command_check_interval=15s
-command_check_interval=-1
-
-
-
 # EXTERNAL COMMAND FILE
 # This is the file that Nagios checks for external command requests.
 # It is also where the command CGI will write commands that are submitted
@@ -159,16 +141,6 @@
 
 
 
-# EXTERNAL COMMAND BUFFER SLOTS
-# This settings is used to tweak the number of items or "slots" that
-# the Nagios daemon should allocate to the buffer that holds incoming 
-# external commands before they are processed.  As external commands 
-# are processed by the daemon, they are removed from the buffer.  
-
-external_command_buffer_slots=4096
-
-
-
 # LOCK FILE
 # This is the lockfile that Nagios will use to store its PID number
 # in when it is running in daemon mode.

Modified: nagioscore/trunk/t/var/status-hosturgencies.dat
===================================================================
--- nagioscore/trunk/t/var/status-hosturgencies.dat	2012-08-02 00:48:03 UTC (rev 2045)
+++ nagioscore/trunk/t/var/status-hosturgencies.dat	2012-08-02 00:49:08 UTC (rev 2046)
@@ -20,7 +20,6 @@
 	nagios_pid=48451
 	daemon_mode=0
 	program_start=1242341791
-	last_command_check=0
 	last_log_rotation=0
 	enable_notifications=1
 	active_service_checks_enabled=1
@@ -42,9 +41,6 @@
 	next_event_id=1
 	next_problem_id=0
 	next_notification_id=1
-	total_external_command_buffer_slots=4096
-	used_external_command_buffer_slots=0
-	high_external_command_buffer_slots=0
 	active_scheduled_host_check_stats=0,0,0
 	active_ondemand_host_check_stats=0,0,0
 	passive_host_check_stats=0,0,0

Modified: nagioscore/trunk/t/var/status.dat
===================================================================
(Binary files differ)

Modified: nagioscore/trunk/t-tap/smallconfig/nagios.cfg
===================================================================
--- nagioscore/trunk/t-tap/smallconfig/nagios.cfg	2012-08-02 00:48:03 UTC (rev 2045)
+++ nagioscore/trunk/t-tap/smallconfig/nagios.cfg	2012-08-02 00:49:08 UTC (rev 2046)
@@ -129,24 +129,6 @@
 
 
 
-# EXTERNAL COMMAND CHECK INTERVAL
-# This is the interval at which Nagios should check for external commands.
-# This value works of the interval_length you specify later.  If you leave
-# that at its default value of 60 (seconds), a value of 1 here will cause
-# Nagios to check for external commands every minute.  If you specify a
-# number followed by an "s" (i.e. 15s), this will be interpreted to mean
-# actual seconds rather than a multiple of the interval_length variable.
-# Note: In addition to reading the external command file at regularly 
-# scheduled intervals, Nagios will also check for external commands after
-# event handlers are executed.
-# NOTE: Setting this value to -1 causes Nagios to check the external
-# command file as often as possible.
-
-#command_check_interval=15s
-command_check_interval=-1
-
-
-
 # EXTERNAL COMMAND FILE
 # This is the file that Nagios checks for external command requests.
 # It is also where the command CGI will write commands that are submitted
@@ -159,16 +141,6 @@
 
 
 
-# EXTERNAL COMMAND BUFFER SLOTS
-# This settings is used to tweak the number of items or "slots" that
-# the Nagios daemon should allocate to the buffer that holds incoming 
-# external commands before they are processed.  As external commands 
-# are processed by the daemon, they are removed from the buffer.  
-
-external_command_buffer_slots=4096
-
-
-
 # LOCK FILE
 # This is the lockfile that Nagios will use to store its PID number
 # in when it is running in daemon mode.

Modified: nagioscore/trunk/t-tap/test-stubs.c
===================================================================
--- nagioscore/trunk/t-tap/test-stubs.c	2012-08-02 00:48:03 UTC (rev 2045)
+++ nagioscore/trunk/t-tap/test-stubs.c	2012-08-02 00:49:08 UTC (rev 2046)
@@ -19,7 +19,6 @@
 
 time_t   program_start;
 time_t   event_start;
-time_t   last_command_check;
 
 int      sigshutdown = FALSE;
 int      sigrestart = FALSE;

Modified: nagioscore/trunk/t-tap/test_commands.c
===================================================================
--- nagioscore/trunk/t-tap/test_commands.c	2012-08-02 00:48:03 UTC (rev 2045)
+++ nagioscore/trunk/t-tap/test_commands.c	2012-08-02 00:49:08 UTC (rev 2046)
@@ -43,9 +43,6 @@
 	va_end(ap);
 	}
 
-circular_buffer external_command_buffer;
-time_t last_command_check;
-int external_command_buffer_slots;
 char *temp_path;
 int date_format;
 host *host_list;

Modified: nagioscore/trunk/t-tap/test_events.c
===================================================================
--- nagioscore/trunk/t-tap/test_events.c	2012-08-02 00:48:03 UTC (rev 2045)
+++ nagioscore/trunk/t-tap/test_events.c	2012-08-02 00:49:08 UTC (rev 2046)
@@ -32,7 +32,6 @@
 
 time_t   program_start;
 time_t   event_start;
-time_t   last_command_check;
 
 int      sigshutdown = FALSE;
 int      sigrestart = FALSE;

Modified: nagioscore/trunk/t-tap/test_nagios_config.c
===================================================================
--- nagioscore/trunk/t-tap/test_nagios_config.c	2012-08-02 00:48:03 UTC (rev 2045)
+++ nagioscore/trunk/t-tap/test_nagios_config.c	2012-08-02 00:49:08 UTC (rev 2046)
@@ -127,7 +127,6 @@
 char            *last_program_version = NULL;
 char            *new_program_version = NULL;
 
-time_t          last_command_check = 0L;
 time_t          last_command_status_update = 0L;
 time_t          last_log_rotation = 0L;
 
@@ -246,10 +245,8 @@
 
 dbuf            check_result_dbuf;
 
-circular_buffer external_command_buffer;
 circular_buffer check_result_buffer;
 pthread_t       worker_threads[TOTAL_WORKER_THREADS];
-int             external_command_buffer_slots = DEFAULT_EXTERNAL_COMMAND_BUFFER_SLOTS;
 
 check_stats     check_statistics[MAX_CHECK_STATS_TYPES];
 

Modified: nagioscore/trunk/t-tap/test_timeperiods.c
===================================================================
--- nagioscore/trunk/t-tap/test_timeperiods.c	2012-08-02 00:48:03 UTC (rev 2045)
+++ nagioscore/trunk/t-tap/test_timeperiods.c	2012-08-02 00:49:08 UTC (rev 2046)
@@ -127,7 +127,6 @@
 char            *last_program_version = NULL;
 char            *new_program_version = NULL;
 
-time_t          last_command_check = 0L;
 time_t          last_command_status_update = 0L;
 time_t          last_log_rotation = 0L;
 
@@ -245,10 +244,8 @@
 
 dbuf            check_result_dbuf;
 
-circular_buffer external_command_buffer;
 circular_buffer check_result_buffer;
 pthread_t       worker_threads[TOTAL_WORKER_THREADS];
-int             external_command_buffer_slots = DEFAULT_EXTERNAL_COMMAND_BUFFER_SLOTS;
 
 check_stats     check_statistics[MAX_CHECK_STATS_TYPES];
 

Modified: nagioscore/trunk/xdata/xsddefault.c
===================================================================
--- nagioscore/trunk/xdata/xsddefault.c	2012-08-02 00:48:03 UTC (rev 2045)
+++ nagioscore/trunk/xdata/xsddefault.c	2012-08-02 00:49:08 UTC (rev 2046)
@@ -52,7 +52,6 @@
 #ifdef NSCGI
 time_t program_start;
 int daemon_mode;
-time_t last_command_check;
 time_t last_log_rotation;
 int enable_notifications;
 int execute_service_checks;
@@ -76,7 +75,6 @@
 extern time_t program_start;
 extern int nagios_pid;
 extern int daemon_mode;
-extern time_t last_command_check;
 extern time_t last_log_rotation;
 extern int enable_notifications;
 extern int execute_service_checks;
@@ -100,9 +98,6 @@
 extern char           *last_program_version;
 extern char           *new_program_version;
 
-extern int external_command_buffer_slots;
-extern circular_buffer external_command_buffer;
-
 extern host *host_list;
 extern service *service_list;
 extern contact *contact_list;
@@ -337,8 +332,6 @@
 	time_t current_time;
 	int fd = 0;
 	FILE *fp = NULL;
-	int used_external_command_buffer_slots = 0;
-	int high_external_command_buffer_slots = 0;
 	int result = OK;
 
 	log_debug_info(DEBUGL_FUNCTIONS, 0, "save_status_data()\n");
@@ -377,18 +370,6 @@
 		return ERROR;
 		}
 
-	/* get number of items in the command buffer */
-	if(check_external_commands == TRUE) {
-		pthread_mutex_lock(&external_command_buffer.buffer_lock);
-		used_external_command_buffer_slots = external_command_buffer.items;
-		high_external_command_buffer_slots = external_command_buffer.high;
-		pthread_mutex_unlock(&external_command_buffer.buffer_lock);
-		}
-	else {
-		used_external_command_buffer_slots = 0;
-		high_external_command_buffer_slots = 0;
-		}
-
 	/* generate check statistics */
 	generate_check_stats();
 
@@ -419,7 +400,6 @@
 	fprintf(fp, "\tnagios_pid=%d\n", nagios_pid);
 	fprintf(fp, "\tdaemon_mode=%d\n", daemon_mode);
 	fprintf(fp, "\tprogram_start=%lu\n", program_start);
-	fprintf(fp, "\tlast_command_check=%lu\n", last_command_check);
 	fprintf(fp, "\tlast_log_rotation=%lu\n", last_log_rotation);
 	fprintf(fp, "\tenable_notifications=%d\n", enable_notifications);
 	fprintf(fp, "\tactive_service_checks_enabled=%d\n", execute_service_checks);
@@ -441,9 +421,6 @@
 	fprintf(fp, "\tnext_event_id=%lu\n", next_event_id);
 	fprintf(fp, "\tnext_problem_id=%lu\n", next_problem_id);
 	fprintf(fp, "\tnext_notification_id=%lu\n", next_notification_id);
-	fprintf(fp, "\ttotal_external_command_buffer_slots=%d\n", external_command_buffer_slots);
-	fprintf(fp, "\tused_external_command_buffer_slots=%d\n", used_external_command_buffer_slots);
-	fprintf(fp, "\thigh_external_command_buffer_slots=%d\n", high_external_command_buffer_slots);
 	fprintf(fp, "\tactive_scheduled_host_check_stats=%d,%d,%d\n", check_statistics[ACTIVE_SCHEDULED_HOST_CHECK_STATS].minute_stats[0], check_statistics[ACTIVE_SCHEDULED_HOST_CHECK_STATS].minute_stats[1], check_statistics[ACTIVE_SCHEDULED_HOST_CHECK_STATS].minute_stats[2]);
 	fprintf(fp, "\tactive_ondemand_host_check_stats=%d,%d,%d\n", check_statistics[ACTIVE_ONDEMAND_HOST_CHECK_STATS].minute_stats[0], check_statistics[ACTIVE_ONDEMAND_HOST_CHECK_STATS].minute_stats[1], check_statistics[ACTIVE_ONDEMAND_HOST_CHECK_STATS].minute_stats[2]);
 	fprintf(fp, "\tpassive_host_check_stats=%d,%d,%d\n", check_statistics[PASSIVE_HOST_CHECK_STATS].minute_stats[0], check_statistics[PASSIVE_HOST_CHECK_STATS].minute_stats[1], check_statistics[PASSIVE_HOST_CHECK_STATS].minute_stats[2]);
@@ -937,8 +914,6 @@
 						daemon_mode = (atoi(val) > 0) ? TRUE : FALSE;
 					else if(!strcmp(var, "program_start"))
 						program_start = strtoul(val, NULL, 10);
-					else if(!strcmp(var, "last_command_check"))
-						last_command_check = strtoul(val, NULL, 10);
 					else if(!strcmp(var, "last_log_rotation"))
 						last_log_rotation = strtoul(val, NULL, 10);
 					else if(!strcmp(var, "enable_notifications"))
@@ -968,14 +943,6 @@
 					else if(!strcmp(var, "process_performance_data"))
 						process_performance_data = (atoi(val) > 0) ? TRUE : FALSE;
 
-					else if(!strcmp(var, "total_external_command_buffer_slots"))
-						buffer_stats[0][0] = atoi(val);
-					else if(!strcmp(var, "used_external_command_buffer_slots"))
-						buffer_stats[0][1] = atoi(val);
-					else if(!strcmp(var, "high_external_command_buffer_slots"))
-						buffer_stats[0][2] = atoi(val);
-
-
 					else if(strstr(var, "_stats")) {
 
 						x = -1;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





More information about the Nagios-commits mailing list