Menu
▾
▴
[Nagios-checkins] CVS: nagios/common objects.c,1.50,1.51
|
From: Ethan G. <ega...@us...> - 2003-08-19 04:19:14
|
Update of /cvsroot/nagios/nagios/common
In directory sc8-pr-cvs1:/tmp/cvs-serv16318/common
Modified Files:
objects.c
Log Message:
Import of existing event broker code, escalation bug fix
Index: objects.c
===================================================================
RCS file: /cvsroot/nagios/nagios/common/objects.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -r1.50 -r1.51
*** objects.c 15 Aug 2003 01:34:10 -0000 1.50
--- objects.c 19 Aug 2003 04:19:11 -0000 1.51
***************
*** 4,8 ****
*
* Copyright (c) 1999-2003 Ethan Galstad (na...@na...)
! * Last Modified: 08-14-2003
*
* License:
--- 4,8 ----
*
* Copyright (c) 1999-2003 Ethan Galstad (na...@na...)
! * Last Modified: 08-18-2003
*
* License:
***************
*** 605,609 ****
lastpointer=temp_hostescalation;
! if(!temp_hostescalation || (compare_hashdata1(temp_hostescalation->host_name,new_hostescalation->host_name)!=0)){
if(lastpointer)
lastpointer->nexthash=new_hostescalation;
--- 605,609 ----
lastpointer=temp_hostescalation;
! if(!temp_hostescalation){
if(lastpointer)
lastpointer->nexthash=new_hostescalation;
***************
*** 644,648 ****
lastpointer=temp_serviceescalation;
! if(!temp_serviceescalation || (compare_hashdata2(temp_serviceescalation->host_name,temp_serviceescalation->description,new_serviceescalation->host_name,new_serviceescalation->description)!=0)){
if(lastpointer)
lastpointer->nexthash=new_serviceescalation;
--- 644,648 ----
lastpointer=temp_serviceescalation;
! if(!temp_serviceescalation){
if(lastpointer)
lastpointer->nexthash=new_serviceescalation;
***************
*** 3240,3244 ****
if(!add_service_to_hashlist(new_service)){
#ifdef NSCORE
! snprintf(temp_buffer,sizeof(temp_buffer)-1,"Error: Could not add new service '%s' on host '%s' (out of memory?)\n",description,host_name);
temp_buffer[sizeof(temp_buffer)-1]='\x0';
write_to_logs_and_console(temp_buffer,NSLOG_CONFIG_ERROR,TRUE);
--- 3240,3244 ----
if(!add_service_to_hashlist(new_service)){
#ifdef NSCORE
! snprintf(temp_buffer,sizeof(temp_buffer)-1,"Error: Could not allocate memory for service list to add new service '%s' on host '%s'\n",description,host_name);
temp_buffer[sizeof(temp_buffer)-1]='\x0';
write_to_logs_and_console(temp_buffer,NSLOG_CONFIG_ERROR,TRUE);
***************
*** 3626,3630 ****
if(!add_serviceescalation_to_hashlist(new_serviceescalation)){
#ifdef NSCORE
! snprintf(temp_buffer,sizeof(temp_buffer)-1,"Error: Could not allocate memory for serviceescalation list to add service '%s' on host '%s' escalation\n",description,host_name);
temp_buffer[sizeof(temp_buffer)-1]='\x0';
write_to_logs_and_console(temp_buffer,NSLOG_CONFIG_ERROR,TRUE);
--- 3626,3630 ----
if(!add_serviceescalation_to_hashlist(new_serviceescalation)){
#ifdef NSCORE
! snprintf(temp_buffer,sizeof(temp_buffer)-1,"Error: Could not allocate memory for serviceescalation list to add escalation for service '%s' on host '%s'\n",description,host_name);
temp_buffer[sizeof(temp_buffer)-1]='\x0';
write_to_logs_and_console(temp_buffer,NSLOG_CONFIG_ERROR,TRUE);
***************
*** 3872,3876 ****
if(!add_servicedependency_to_hashlist(new_servicedependency)){
#ifdef NSCORE
! snprintf(temp_buffer,sizeof(temp_buffer)-1,"Error: Could not allocate memory for servicedependency list to add service '%s' on host '%s' dependency\n",dependent_service_description,dependent_host_name);
temp_buffer[sizeof(temp_buffer)-1]='\x0';
write_to_logs_and_console(temp_buffer,NSLOG_CONFIG_ERROR,TRUE);
--- 3872,3876 ----
if(!add_servicedependency_to_hashlist(new_servicedependency)){
#ifdef NSCORE
! snprintf(temp_buffer,sizeof(temp_buffer)-1,"Error: Could not allocate memory for servicedependency list to add dependency for service '%s' on host '%s'\n",dependent_service_description,dependent_host_name);
temp_buffer[sizeof(temp_buffer)-1]='\x0';
write_to_logs_and_console(temp_buffer,NSLOG_CONFIG_ERROR,TRUE);
***************
*** 4021,4025 ****
if(!add_hostdependency_to_hashlist(new_hostdependency)){
#ifdef NSCORE
! snprintf(temp_buffer,sizeof(temp_buffer)-1,"Error: Could not allocate memory for hostdependency list to add host '%s' dependency\n",dependent_host_name);
temp_buffer[sizeof(temp_buffer)-1]='\x0';
write_to_logs_and_console(temp_buffer,NSLOG_CONFIG_ERROR,TRUE);
--- 4021,4025 ----
if(!add_hostdependency_to_hashlist(new_hostdependency)){
#ifdef NSCORE
! snprintf(temp_buffer,sizeof(temp_buffer)-1,"Error: Could not allocate memory for hostdependency list to add dependency for host '%s'\n",dependent_host_name);
temp_buffer[sizeof(temp_buffer)-1]='\x0';
write_to_logs_and_console(temp_buffer,NSLOG_CONFIG_ERROR,TRUE);
***************
*** 4155,4159 ****
if(!add_hostescalation_to_hashlist(new_hostescalation)){
#ifdef NSCORE
! snprintf(temp_buffer,sizeof(temp_buffer)-1,"Error: Could not allocate memory for hostescalation list to add host '%s' escalation\n",host_name);
temp_buffer[sizeof(temp_buffer)-1]='\x0';
write_to_logs_and_console(temp_buffer,NSLOG_CONFIG_ERROR,TRUE);
--- 4155,4159 ----
if(!add_hostescalation_to_hashlist(new_hostescalation)){
#ifdef NSCORE
! snprintf(temp_buffer,sizeof(temp_buffer)-1,"Error: Could not allocate memory for hostescalation list to add escalation for host '%s'\n",host_name);
temp_buffer[sizeof(temp_buffer)-1]='\x0';
write_to_logs_and_console(temp_buffer,NSLOG_CONFIG_ERROR,TRUE);
***************
*** 4450,4454 ****
if(!add_hostextinfo_to_hashlist(new_hostextinfo)){
#ifdef NSCORE
! snprintf(temp_buffer,sizeof(temp_buffer)-1,"Error: Could not allocate memory for hostextinfo list to add host '%s' extended info.\n",host_name);
temp_buffer[sizeof(temp_buffer)-1]='\x0';
write_to_logs_and_console(temp_buffer,NSLOG_CONFIG_ERROR,TRUE);
--- 4450,4454 ----
if(!add_hostextinfo_to_hashlist(new_hostextinfo)){
#ifdef NSCORE
! snprintf(temp_buffer,sizeof(temp_buffer)-1,"Error: Could not allocate memory for hostextinfo list to add extended info for host '%s'.\n",host_name);
temp_buffer[sizeof(temp_buffer)-1]='\x0';
write_to_logs_and_console(temp_buffer,NSLOG_CONFIG_ERROR,TRUE);
***************
*** 4633,4637 ****
if(!add_serviceextinfo_to_hashlist(new_serviceextinfo)){
#ifdef NSCORE
! snprintf(temp_buffer,sizeof(temp_buffer)-1,"Error: Could not allocate memory for serviceextinfo list to add service '%s' on host '%s' extended info.\n",description,host_name);
temp_buffer[sizeof(temp_buffer)-1]='\x0';
write_to_logs_and_console(temp_buffer,NSLOG_CONFIG_ERROR,TRUE);
--- 4633,4637 ----
if(!add_serviceextinfo_to_hashlist(new_serviceextinfo)){
#ifdef NSCORE
! snprintf(temp_buffer,sizeof(temp_buffer)-1,"Error: Could not allocate memory for serviceextinfo list to add extended info for service '%s' on host '%s'.\n",description,host_name);
temp_buffer[sizeof(temp_buffer)-1]='\x0';
write_to_logs_and_console(temp_buffer,NSLOG_CONFIG_ERROR,TRUE);
|