--- projects/cms/source/util/uk/org/iscream/cms/util/QueueMonitor.java	2001/02/26 00:36:10	1.3
+++ projects/cms/source/util/uk/org/iscream/cms/util/QueueMonitor.java	2002/05/21 16:47:19	1.10
@@ -1,8 +1,28 @@
+/* 
+ * i-scream central monitoring system
+ * http://www.i-scream.org.uk
+ * 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---
-package uk.ac.ukc.iscream.util;
+package uk.org.iscream.cms.server.util;
 
 //---IMPORTS---
-import uk.ac.ukc.iscream.util.*;
+import uk.org.iscream.cms.server.util.*;
 
 /**
  * This class monitors a given Queue at regular intervals,
@@ -10,7 +30,7 @@ import uk.ac.ukc.iscream.util.*;
  * same Queue being monitored.
  *
  * @author  $Author: tdb $
- * @version $Id: QueueMonitor.java,v 1.3 2001/02/26 00:36:10 tdb Exp $
+ * @version $Id: QueueMonitor.java,v 1.10 2002/05/21 16:47:19 tdb Exp $
  */
 class QueueMonitor extends Thread {
 
@@ -19,7 +39,7 @@ class QueueMonitor extends Thread {
     /**
      * The current CVS revision of this class
      */
-    public static final String REVISION = "$Revision: 1.3 $";
+    public static final String REVISION = "$Revision: 1.10 $";
     
 //---STATIC METHODS---
 
@@ -34,6 +54,9 @@ class QueueMonitor extends Thread {
      * @param name A name to identify the source Queue with
      */
     public QueueMonitor (Queue sourceQueue, Queue destQueue, long interval, String name) {
+        // set the Thread name
+        setName("util.QueueMonitor");
+        
         _sourceQueue = sourceQueue;
         _destQueue = destQueue;
         _interval = interval;
@@ -55,9 +78,11 @@ class QueueMonitor extends Thread {
             try { Thread.sleep(_interval); } catch(Exception e) {}
             // check the Queue
             String status = _sourceQueue.xmlStatus();
+            // get a hash of our Queue (for identification)
+            String hashCode = String.valueOf(_sourceQueue.hashCode());
             // create some XML
             String date = new Long(System.currentTimeMillis()/((long) 1000)).toString();
-            String xml = "<packet type=\"queueStat\" date=\""+date+"\" name=\""+_srcName+"\">" + status + "</packet>";
+            String xml = "<packet type=\"queueStat\" date=\""+date+"\" name=\""+_srcName+"\" hashCode=\""+hashCode+"\">" + status + "</packet>";
             // write XML to destination Queue
             _destQueue.add(xml);
         }
@@ -69,9 +94,11 @@ class QueueMonitor extends Thread {
     public void shutdown() {
         // this will stop the main loop
         _run = false;
+        // get a hash of our Queue (for identification)
+        String hashCode = String.valueOf(_sourceQueue.hashCode());
         // create some XML
         String date = new Long(System.currentTimeMillis()/((long) 1000)).toString();
-        String xml = "<packet type=\"queueStat\" date=\""+date+"\" name=\""+_srcName+"\" shutdown=\"true\"></packet>";
+        String xml = "<packet type=\"queueStat\" date=\""+date+"\" name=\""+_srcName+"\" hashCode=\""+hashCode+"\" shutdown=\"true\"></packet>";
         // write XML to destination Queue
         _destQueue.add(xml);
     }
@@ -80,7 +107,7 @@ class QueueMonitor extends Thread {
      * Overrides the {@link java.lang.Object#toString() Object.toString()}
      * method to provide clean logging (every class should have this).
      *
-     * This uses the uk.ac.ukc.iscream.util.FormatName class
+     * This uses the uk.org.iscream.cms.server.util.FormatName class
      * to format the toString()
      *
      * @return the name of this class and its CVS revision