--- projects/cms/source/ihost/ihost.c 2002/05/20 12:28:46 1.17 +++ projects/cms/source/ihost/ihost.c 2002/05/21 14:07:32 1.18 @@ -19,6 +19,7 @@ #include #include +#include #include #include #include @@ -30,11 +31,14 @@ #include #include #include +#include #define versionNo 0.8 #define RECONFIGURE_RETURN_CODE 2 #define UDP_MAX_PACKET_SIZE 8192 +#define logmessage(level, ...) do { cur_level = level; errf(__VA_ARGS__); } while (0) + typedef struct{ int fm_port; char *fm_host; @@ -52,6 +56,20 @@ typedef struct{ }ihost_state_t; +static int log_level; +static int cur_level; +static int syslog_logging; + +void log_errors(const char *message){ + if(log_level>=cur_level){ + if (syslog_logging==1){ + syslog(cur_level, "%s\n", message); + }else{ + fprintf(stderr, "%s\n", message); + } + } +} + char* sock_comm(FILE *f_r, FILE *f_w, char *sendString){ char *reply; fprintf(f_w, "%s\n", sendString); @@ -77,13 +95,14 @@ int ihost_configure(ihost_state_t *ihost_state){ if (ihost_state->last_modified!=NULL) free(ihost_state->last_modified); if (ihost_state->files_list!=NULL) free(ihost_state->files_list); + logmessage(LOG_DEBUG, "Setting up configure socket to %s on port %d", ihost_state->fm_host, ihost_state->fm_port); if ((sd = socket(AF_INET, SOCK_STREAM, PF_UNSPEC)) < 0) { - errf("Can't create AF_INET socket (%m)"); + logmessage(LOG_ERR, "Can't create AF_INET socket (%m)"); return -1; } if (get_host_addr(ihost_state->fm_host, &haddr) != 0){ - errf("Failed to resolve address %s (%m)", ihost_state->fm_host); + logmessage(LOG_ERR, "Failed to resolve address %s (%m)", ihost_state->fm_host); return -1; } @@ -93,115 +112,123 @@ int ihost_configure(ihost_state_t *ihost_state){ addr.sin_port = htons(ihost_state->fm_port); if (connect(sd, (struct sockaddr *)&addr, sizeof addr) != 0) { - errf("Failed to connect to %s on port %d (%m)", ihost_state->fm_host, ihost_state->fm_port); + logmessage(LOG_ERR, "Failed to connect to %s on port %d (%m)", ihost_state->fm_host, ihost_state->fm_port); return -1; } /* Need to open 2 files, one for reading one for writing, as it gets confused if we only use 1 :) */ if ((fm_fd_r=fdopen(sd,"r")) == NULL){ - errf("Failed to open read stream (%m)"); + logmessage(LOG_ERR, "Failed to open read stream (%m)"); return -1; } if ((fm_fd_w=fdopen(dup(sd),"w")) == NULL){ - errf("Failed to open write stream (%m)"); + logmessage(LOG_ERR, "Failed to open write stream (%m)"); return -1; } ip_len=sizeof ip; memset(&ip, 0, ip_len); if((getsockname(sd, &ip, &ip_len)) != 0){ - errf("Failed to get IP address (%m)"); + logmessage(LOG_ERR, "Failed to get IP address (%m)"); return -1; } if (ip.sa_family!=AF_INET){ - errf("sa family is wrong type"); + logmessage(LOG_ERR, "sa family is wrong type"); return -1; } if((ihost_state->my_ip=inet_ntoa(((struct sockaddr_in *)&ip)->sin_addr))==NULL){ - errf("Failed to get IP (%m)"); + logmessage(LOG_ERR, "Failed to get IP (%m)"); return -1; } - + + logmessage(LOG_DEBUG, "Sending STARTCONIG"); reply=sock_comm(fm_fd_r, fm_fd_w, "STARTCONFIG"); if ((reply==NULL) || (strncasecmp(reply, "OK", 2) != 0) ) { - errf("Server error"); + logmessage(LOG_ERR, "Server error on STARTCONFIG"); return -1; } + logmessage(LOG_DEBUG, "Sending LASTMODIFIED"); reply=sock_comm(fm_fd_r, fm_fd_w, "LASTMODIFIED"); if((reply== NULL) || (strncasecmp(reply, "ERROR", 5) ==0)){ - errf("Server error (%m)"); + logmessage(LOG_ERR, "Server error on LASTMODIFIED (%m)"); return -1; } if((ihost_state->last_modified=strdup(reply)) == NULL){ - errf("strdup failed (%m)"); + logmessage(LOG_ERR, "strdup failed (%m)"); return -1; } - + + logmessage(LOG_DEBUG, "Sending FILELIST"); reply=sock_comm(fm_fd_r, fm_fd_w, "FILELIST"); if((reply== NULL) || (strncasecmp(reply, "ERROR", 5) ==0)){ - errf("Server error (%m)"); + logmessage(LOG_ERR, "Server error on FILELIST (%m)"); return -1; } if((ihost_state->files_list=strdup(reply)) == NULL){ - errf("strdup failed (%m)"); + logmessage(LOG_ERR, "strdup failed (%m)"); return -1; } + logmessage(LOG_DEBUG, "Sending FQDN"); reply=sock_comm(fm_fd_r, fm_fd_w, "FQDN"); if((reply== NULL) || (strncasecmp(reply, "ERROR", 5)==0)){ - errf("Server error (%m)"); + logmessage(LOG_ERR, "Server error on FQDN (%m)"); return -1; } if((ihost_state->my_fqdn=strdup(reply)) == NULL){ - errf("strdup failed (%m)"); + logmessage(LOG_ERR, "strdup failed (%m)"); return -1; } + logmessage(LOG_DEBUG, "Sending FQDN"); reply=sock_comm(fm_fd_r, fm_fd_w, "UDPUpdateTime"); if(reply== NULL){ - errf("Server error (%m)"); + logmessage(LOG_ERR, "Server error (%m)"); return -1; } if (strncasecmp(reply, "ERROR", 5) != 0){ ihost_state->udp_update_time=atoi(reply); } - + + logmessage(LOG_DEBUG, "Sending TCPUpdateTime"); reply=sock_comm(fm_fd_r, fm_fd_w, "TCPUpdateTime"); if(reply== NULL){ - errf("Server error (%m)"); + logmessage(LOG_ERR, "Server error on TCPUpdateTime (%m)"); return -1; } if (strncasecmp(reply, "ERROR", 5) != 0){ ihost_state->tcp_update_time=atoi(reply); } + logmessage(LOG_DEBUG, "Sending ENDCONFIG"); reply=sock_comm(fm_fd_r, fm_fd_w, "ENDCONFIG"); if(reply== NULL){ - errf("Server error (%m)"); + logmessage(LOG_ERR, "Server error on ENDCONFIG (%m)"); return -1; } + logmessage(LOG_DEBUG, "Sending FILTER"); reply=sock_comm(fm_fd_r, fm_fd_w, "FILTER"); if((reply== NULL) || (strncasecmp(reply, "ERROR", 5)==0)){ - errf("Server error FILTER failed (%m)"); + logmessage(LOG_ERR, "Server error FILTER failed (%m)"); return -1; } reply_ptr=strchr(reply,';'); if (reply_ptr==NULL){ - errf("Incorrect data returned"); + logmessage(LOG_ERR, "Incorrect data returned"); return -1; } *reply_ptr='\0'; if((ihost_state->server_fqdn=strdup(reply)) == NULL){ - errf("strdup failed (%m)"); + logmessage(LOG_ERR, "strdup failed (%m)"); return -1; } reply=reply_ptr + 1; reply_ptr=strchr(reply,';'); if (reply_ptr==NULL){ - errf("Incorrect data returned 2"); + logmessage(LOG_ERR, "Incorrect data returned 2"); return -1; } *reply_ptr='\0'; @@ -209,22 +236,23 @@ int ihost_configure(ihost_state_t *ihost_state){ reply=reply_ptr+1; ihost_state->server_tcp_port=atoi(reply); if ((ihost_state->server_tcp_port==0) || (ihost_state->server_udp_port==0)){ - errf("Incorrect data returned 3 "); + logmessage(LOG_ERR, "Incorrect data returned 3 "); return -1; } + logmessage(LOG_DEBUG, "Sending END"); reply=sock_comm(fm_fd_r, fm_fd_w, "END"); if((reply== NULL) || (strncasecmp(reply, "ERROR", 5) ==0 )){ - errf("Server error (%m)"); + logmessage(LOG_ERR, "Server error on END (%m)"); return -1; } if(fclose(fm_fd_r) !=0){ - errf("Failed to close read FD (%m)"); + logmessage(LOG_ERR, "Failed to close read FD (%m)"); return -1; } if(fclose(fm_fd_w) !=0){ - errf("Failed to close write FD (%m)"); + logmessage(LOG_ERR, "Failed to close write FD (%m)"); return -1; } @@ -239,13 +267,14 @@ int heartbeat(ihost_state_t *ihost_state){ char *reply; int exitcode=0; + logmessage(LOG_DEBUG, "Setting up configure socket to %s on port %d", ihost_state->server_fqdn, ihost_state->server_tcp_port); if ((sd = socket(AF_INET, SOCK_STREAM, PF_UNSPEC)) < 0) { - errf("Can't create AF_INET socket (%m)"); + logmessage(LOG_ERR, "Can't create AF_INET socket (%m)"); return -1; } if (get_host_addr(ihost_state->server_fqdn, &haddr) != 0){ - errf("Failed to resolve address %s (%m)", ihost_state->fm_host); + logmessage(LOG_ERR, "Failed to resolve address %s (%m)", ihost_state->server_fqdn); return -1; } @@ -255,63 +284,71 @@ int heartbeat(ihost_state_t *ihost_state){ addr.sin_port = htons(ihost_state->server_tcp_port); if (connect(sd, (struct sockaddr *)&addr, sizeof addr) != 0) { - errf("Failed to connect to %s on port %d (%m)", ihost_state->fm_host, ihost_state->fm_port); + logmessage(LOG_ERR, "Failed to connect to %s on port %d (%m)", ihost_state->server_fqdn, ihost_state->server_tcp_port); return -1; } /* Need to open 2 files, one for reading one for writing, as it gets confused if we only use 1 :) */ if ((fm_fd_r=fdopen(sd,"r")) == NULL){ - errf("Failed to open stream (%m)"); + logmessage(LOG_ERR, "Failed to open stream (%m)"); return -1; } if ((fm_fd_w=fdopen(dup(sd),"w")) == NULL){ - errf("Failed to open stream (%m)"); + logmessage(LOG_ERR, "Failed to open stream (%m)"); return -1; } + logmessage(LOG_DEBUG, "Sending HEARTBEAT"); reply=sock_comm(fm_fd_r, fm_fd_w, "HEARTBEAT"); if ((reply==NULL) || (strncasecmp(reply, "ERROR", 5) == 0) ) { - errf("Server error"); + logmessage(LOG_ERR, "Server error on HEARTBEAT"); return -1; } + logmessage(LOG_DEBUG, "Sending CONFIG"); reply=sock_comm(fm_fd_r, fm_fd_w, "CONFIG"); if ((reply==NULL) || (strncasecmp(reply, "ERROR", 5) == 0) ) { - errf("Server error"); + logmessage(LOG_ERR, "Server error on CONFIG"); return -1; } + logmessage(LOG_DEBUG, "Sending %s", ihost_state->files_list); reply=sock_comm(fm_fd_r, fm_fd_w, ihost_state->files_list); if ((reply==NULL) || (strncasecmp(reply, "OK", 2) != 0) ) { - errf("Server error"); + logmessage(LOG_ERR, "Server error on fileslist"); return -1; } + logmessage(LOG_DEBUG, "Sending %s", ihost_state->last_modified); reply=sock_comm(fm_fd_r, fm_fd_w, ihost_state->last_modified); if (reply==NULL) { - errf("Server error"); + logmessage(LOG_ERR, "Server error NULL recieved on lastmodified"); return -1; } if (strncasecmp(reply, "ERROR", 5) == 0){ /* Means the config has changed */ + logmessage(LOG_INFO, "Recieved ERROR from server for a reconfigure required"); exitcode=RECONFIGURE_RETURN_CODE; } + + logmessage(LOG_DEBUG,"Sending KEY"); reply=sock_comm(fm_fd_r, fm_fd_w, "KEY"); if ((reply==NULL) || (strncasecmp(reply, "ERROR", 5) == 0) ) { - errf("Server error"); + logmessage(LOG_ERR, "Server error on KEY"); return -1; } if (ihost_state->key!=NULL) free(ihost_state->key); if((ihost_state->key=strdup(reply)) == NULL){ - errf("strdup failed (%m)"); + logmessage(LOG_ERR, "strdup failed (%m)"); return -1; } + logmessage(LOG_DEBUG,"Sending ENDHEARTBEAT"); reply=sock_comm(fm_fd_r, fm_fd_w, "ENDHEARTBEAT"); if((reply== NULL) || (strncasecmp(reply, "ERROR", 5) ==0 )){ - errf("Server error (%m)"); + logmessage(LOG_ERR, "Server error on ENDHEARTBEAT (%m)"); return -1; } @@ -319,11 +356,11 @@ int heartbeat(ihost_state_t *ihost_state){ fflush(fm_fd_w); if(fclose(fm_fd_r) !=0){ - errf("Failed to close read FD (%m)"); + logmessage(LOG_ERR, "Failed to close read FD (%m)"); return -1; } if(fclose(fm_fd_w) !=0){ - errf("Failed to close write FD (%m)"); + logmessage(LOG_ERR, "Failed to close write FD (%m)"); return -1; } @@ -336,30 +373,40 @@ char *stat_grab(ihost_state_t *ihost_state, int counte char *xml_data=NULL; char *xml_data_p; int x=0; - + + logmessage(LOG_DEBUG,"get_cpu_stats"); stats[0]=get_cpu_stats(); + logmessage(LOG_DEBUG,"get_disk_stats"); stats[1]=get_disk_stats(); + logmessage(LOG_DEBUG,"get_load_stats"); stats[2]=get_load_stats(); + logmessage(LOG_DEBUG,"get_memory_stats"); stats[3]=get_memory_stats(); + logmessage(LOG_DEBUG,"get_os_info"); stats[4]=get_os_info(); + logmessage(LOG_DEBUG,"get_page_stats"); stats[5]=get_page_stats(); + logmessage(LOG_DEBUG,"get_process_stats"); stats[6]=get_process_stats(); + logmessage(LOG_DEBUG,"get_swap_stats"); stats[7]=get_swap_stats(); + logmessage(LOG_DEBUG,"get_user_stats"); stats[8]=get_user_stats(); for(;x%s", counter, ihost_state->my_fqdn, time(NULL), ihost_state->my_ip, ihost_state->key, xml_data); free(xml_data_p); - + + logmessage(LOG_DEBUG,"Generated XML Data of : %s", xml_data); return xml_data; } @@ -382,17 +430,17 @@ int send_stats(ihost_state_t *ihost_state, char *data_ len=strlen(data_stream); if(len>UDP_MAX_PACKET_SIZE){ - errf("Too big to send to server. Please reconfigure client and server and recompile"); + logmessage(LOG_ERR, "Too big to send to server. Please reconfigure client and server and recompile"); exit(1); } - + logmessage(LOG_DEBUG,"Resolving IP of server"); if (get_host_addr(ihost_state->server_fqdn, &haddr) != 0){ - errf("Failed to resolve address %s (%m)", ihost_state->fm_host); + logmessage(LOG_ERR, "Failed to resolve address %s (%m)", ihost_state->server_fqdn); return -1; } - + logmessage(LOG_DEBUG,"Creating UDP connection to %s on %d",ihost_state->server_fqdn, ihost_state->server_udp_port); if((sd=socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0){ - errf("failed to create UDP socket (%m)"); + logmessage(LOG_ERR, "failed to create UDP socket (%m)"); return -1; } @@ -401,8 +449,9 @@ int send_stats(ihost_state_t *ihost_state, char *data_ memcpy((char *)&addr.sin_addr, &haddr, sizeof haddr); addr.sin_port = htons(ihost_state->server_udp_port); + logmessage(LOG_INFO,"Sending packet : %s", data_stream); if((sendto(sd, data_stream, len, 0, (struct sockaddr *) &addr, sizeof(addr))) != len){ - errf("Send the wrong number of bytes (%m)"); + logmessage(LOG_ERR, "Send the wrong number of bytes (%m)"); return -1; } @@ -429,11 +478,19 @@ int main(int argc, char **argv){ long udp_time=0, tcp_time=0, stat_grab_time=0, cur_time=0; int sleep_delay=0; char *xml_stats; - + pid_t pid; int cmdopt; extern int optind; - int verbose=0, daemon=0, syslog=0 ; - + int verbose=0, daemon=0; + extern int syslog_logging; + extern int log_level; + extern int cur_level; + + log_level=1; + cur_level=1; + syslog_logging=0; + + errf_set_ofunc(log_errors); /* NULL'ify so i can tell if i need to free it or not */ ihost_state.fm_host=NULL; ihost_state.my_fqdn=NULL; @@ -443,6 +500,7 @@ int main(int argc, char **argv){ ihost_state.key=NULL; errf_set_progname(argv[0]); + while((cmdopt=getopt(argc, argv, "vdshV")) != -1){ switch(cmdopt){ @@ -451,19 +509,23 @@ int main(int argc, char **argv){ break; case 'd': + /* Force syslog logging since stderr will be closed in this case */ + syslog_logging=1; daemon=1; break; case 's': - syslog=1; + syslog_logging=1; break; case 'h': usage(argv[0]); break; + case 'V': errf("%s version %f",argv[0], versionNo); break; + default: usage(argv[0]); exit(1); @@ -480,10 +542,53 @@ int main(int argc, char **argv){ errf("Invalid port number"); usage(argv[0]); } - printf("%s\n%d\n",ihost_state.fm_host, ihost_state.fm_port); + if(daemon==1){ + pid=fork(); + if(pid==-1){ + errf("Fork failed, can't background. Exiting"); + exit(1); + }else if(pid!=0){ + /* Parent process */ + return 0; + } + /* We should now be in the background*/ + if(setsid()==-1){ + errf("setsid failed (%m)"); + exit(1); + } + fclose(stdin); + fclose(stdout); + fclose(stderr); + } + + if(syslog_logging==1){ + openlog(errf_get_progname(),0,LOG_ERR); + setlogmask(LOG_UPTO(LOG_DEBUG)); + } + + switch(verbose){ + case 0: + /* Critical errors + */ + log_level=LOG_ERR; + break; + case 1: + /* Recoverable errors */ + log_level=LOG_WARNING; + break; + case 2: + /* Print stuff like the XML packets */ + log_level=LOG_INFO; + break; + default: + /* Must have lots of v's */ + /* Print out everything its doing */ + log_level=LOG_DEBUG; + break; + } + if(ihost_configure(&ihost_state)!=0){ - errf("configure failed"); + logmessage(LOG_ERR,"configure failed"); /* Ok, ideally we prob should have 2 copies of the structure and carry on if this happens.. But we dont :) (at the moment) */ exit(1); @@ -492,32 +597,34 @@ int main(int argc, char **argv){ for(;;){ cur_time=time(NULL); if(cur_time>=tcp_time){ - /*printf("sending TCP\n");*/ + logmessage(LOG_DEBUG,"Sending heartbeat"); heartbeat_exit=heartbeat(&ihost_state); if(heartbeat_exit==RECONFIGURE_RETURN_CODE){ - /*errf("heartbeat needs to be reconfigured");*/ + logmessage(LOG_INFO,"heartbeat needs to be reconfigured"); ihost_configure(&ihost_state); - /* So udp doesn't wait til next sending before updating */ udp_time=0; } if(heartbeat_exit==-1){ - errf("ah crap"); + logmessage(LOG_ERR,"Heartbeat failed"); exit(1); } tcp_time=time(NULL)+ihost_state.tcp_update_time; + logmessage(LOG_DEBUG,"next tcp time should be %d", tcp_time); } if(cur_time>=udp_time){ - /*printf("sending UDP\n");*/ + logmessage(LOG_DEBUG,"Sending udp data"); + stat_grab_time=time(NULL); if((xml_stats=stat_grab(&ihost_state, counter++)) == NULL){ - errf("Failed to get stats (%m)"); + logmessage(LOG_ERR,"Failed to get stats (%m)"); exit(1); } stat_grab_time=time(NULL)-stat_grab_time; send_stats(&ihost_state, xml_stats); free(xml_stats); udp_time=time(NULL)+ihost_state.udp_update_time-stat_grab_time; + logmessage(LOG_DEBUG,"next udp time should be %d", udp_time); } if(tcp_time0) sleep(sleep_delay); } return 0;