--- projects/cms/source/host/c++/Host.cpp	2001/03/06 00:40:28	1.3
+++ projects/cms/source/host/c++/Host.cpp	2001/03/23 14:08:49	1.4
@@ -134,31 +134,24 @@ int main(){
 		
 		
 		localTime = time(NULL);
-		//  std::cout << ".";
 		// keep going while no non-fatal errors have occurred
 		int waitTime = 0;
 		
 		if ( nextTCPTime  <= nextAveragerTime ){
-			// std::cout << "-";
 			if ( nextTCPTime >= nextUDPTime ){
-				// std::cout << "}";
 				nextAction = 3;
 				waitTime = nextUDPTime - localTime;
 			} else {
 				// set the heartbeat to be the next item
-				// std::cout << "{";
 				nextAction = 1;
 				waitTime = nextTCPTime - localTime;
 			} // if
 		} else {
-			// std::cout << "+";
 			if ( nextAveragerTime >=  nextUDPTime ){
-				// std::cout << "[";
 				nextAction = 3;
 				waitTime = nextUDPTime - localTime;
 			} else {
 				// set grabstats to be in the next action
-				// std::cout << "]";
 				nextAction = 2;
 				waitTime = nextAveragerTime - localTime;
 			} // if
@@ -166,7 +159,7 @@ int main(){
 		
 		// sleep until this time only if it is greater than 1!
 		if ( waitTime >= 1 ){
-			sleep(waitTime); /// crashes here
+			sleep(waitTime);
 			
 		} 
 		
@@ -202,15 +195,17 @@ int main(){
 			        
 			        break;
 			case 2: nextAveragerTime = localTime + AveragerUpdateTime; 
+			        /*
 			        if ( sysMon.collect() > 0 ){
 				 	// suggests that there should be an alert
 					std::cout << "Alert Status" << endl;				 	
-				}
+				    }*/
 			        break;
 			default: std::cout << "Scheduled UDP Connection" << endl; 
+			     sysMon.collect();
 				 nextUDPTime = localTime + UDPUpdateTime; 
 				 // package up the system data
-				 string host = (config.getSmallNet())->getHostName();
+				 string host = config.getFQDN();
 				 string ip = (config.getSmallNet())->getHostIP();
 				 
 				 string seq = "";
@@ -221,12 +216,14 @@ int main(){
 				 string date = "";
 				 sprintf(buffer,"%u", localTime); 
 				 date = buffer;
-     			 string attributes = "type=\"data\" machine_name=\""+host+"\" ip=\""+ip+"\" date=\""+date+"\" seq_no=\""+seq+"\"";
+     			 string attributes = "type=\"data\" machine_name=\""+host+"\" date=\""+date+"\" seq_no=\""+seq+"\"";
 
 				 XMLFormatter xml("packet",attributes);
 				 // put in the data
 				 xml.addString(sysMon.getData());
 				 (config.getSmallNet())->sendUPDPacket(config.getUDPFilterName(), config.getUDPFilterPort(), xml.returnXML());
+				 // now clear the averaged data
+				 sysMon.clearData();
 				 sequence++;
 				 break;
 		} // switch