--- projects/cms/source/host/java/JavaHost.java	2000/12/08 15:44:56	1.5
+++ projects/cms/source/host/java/JavaHost.java	2002/05/18 18:15:57	1.8
@@ -1,3 +1,22 @@
+/* 
+ * i-scream central monitoring system
+ * Copyright (C) 2000-2002 i-scream
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
 //---PACKAGE DECLARATION---
 
 //---IMPORTS---
@@ -7,8 +26,8 @@
  * Designed to be used as a working design to build the C++ hosts on.
  * Hopefully fully functional and thus can be used as part of a test rig.
  *
- * @author  $Author: ab11 $
- * @version $Id: JavaHost.java,v 1.5 2000/12/08 15:44:56 ab11 Exp $
+ * @author  $Author: tdb $
+ * @version $Id: JavaHost.java,v 1.8 2002/05/18 18:15:57 tdb Exp $
  */
 class JavaHost {
     
@@ -36,23 +55,23 @@ class JavaHost {
         SystemMonitor sysMon = new SystemMonitor(config);
         
         try {
-        	udpcheckInterval = Long.parseLong(config.getProperty("UDPUpdateTime")) * 1000;
-        	System.out.println("Configured UDPUpdateTime");
+            udpcheckInterval = Long.parseLong(config.getProperty("UDPUpdateTime")) * 1000;
+            System.out.println("Configured UDPUpdateTime");
         }
         catch ( NumberFormatException e ){
-        	System.out.println("The value for UDPUpdateTime is invalid, using a default");
-        	// 1 mins
-        	udpcheckInterval = 1000 * 60;  // 1 minute
+            System.out.println("The value for UDPUpdateTime is invalid, using a default");
+            // 1 mins
+            udpcheckInterval = 1000 * 60;  // 1 minute
         }
         
         try {
-        	tcpcheckInterval = Long.parseLong(config.getProperty("TCPUpdateTime")) * 1000;
-        	System.out.println("Configured TCPUpdateTime");
+            tcpcheckInterval = Long.parseLong(config.getProperty("TCPUpdateTime")) * 1000;
+            System.out.println("Configured TCPUpdateTime");
         }
         catch ( NumberFormatException e ){
-        	System.out.println("The value for UDPUpdateTime is invalid, using a default");
-        	// 10 mins
-        	tcpcheckInterval = 10000 * 60;  // 5 minutes
+            System.out.println("The value for UDPUpdateTime is invalid, using a default");
+            // 10 mins
+            tcpcheckInterval = 10000 * 60;  // 5 minutes
         }
         
         // the current time..
@@ -65,39 +84,41 @@ class JavaHost {
             // keep going for ever and ever ;)
             
             if ( nextTCP < nextUDP ){
-            	try {
-            		long sleeptime = nextTCP - currentTime;
-            		if ( sleeptime > 0 ){
-            			Thread.sleep(sleeptime);
-            		}
-            		nextTCP += tcpcheckInterval;
-            		// send a heartbeat
-            		System.out.println("Sending Heartbeat");
-		        config.sendHeartBeat();
-		        if ( config.reloadConfig() ){
-		            System.out.println("Resarting System");
-		            break;	
-		        }
-		 }
-		 catch ( InterruptedException e ){
-		 	// do nothing
-		 }
+                try {
+                    long sleeptime = nextTCP - currentTime;
+                    if ( sleeptime > 0 ){
+                        Thread.sleep(sleeptime);
+                    }
+                    nextTCP += tcpcheckInterval;
+                    // send a heartbeat
+                    //System.out.println("Sending Heartbeat");
+                        System.out.print("+");
+                config.sendHeartBeat();
+                if ( config.reloadConfig() ){
+                    System.out.println("\nRestarting System");
+                    break;  
+                }
+         }
+         catch ( InterruptedException e ){
+            // do nothing
+         }
             }
             else {
-            	try {
-            	    long sleeptime = nextUDP - currentTime;
-            		if ( sleeptime > 0 ){
-            			Thread.sleep(sleeptime);
-            		}
-            		nextUDP += udpcheckInterval;
-            		// send a heartbeat
-		        System.out.println("Sending UDP Packet");
-            		LowLevelNet.sendUDPPacket(config, sysMon.getInfo());  
+                try {
+                    long sleeptime = nextUDP - currentTime;
+                    if ( sleeptime > 0 ){
+                        Thread.sleep(sleeptime);
+                    }
+                    nextUDP += udpcheckInterval;
+                    // send a heartbeat
+                //System.out.println("Sending UDP Packet");
+                System.out.print(".");
+                    LowLevelNet.sendUDPPacket(config, sysMon.getInfo());  
             
-		 }
-		 catch ( InterruptedException e ){
-		 	// do nothing
-		 }	
+         }
+         catch ( InterruptedException e ){
+            // do nothing
+         }  
             }
             
             
@@ -123,4 +144,4 @@ class JavaHost {
 
 //---STATIC ATTRIBUTES---
 
-} // class
\ No newline at end of file
+} // class