ViewVC Help

View File | Revision Log | Show Annotations | Revision Graph | Root Listing

root/i-scream/projects/cms/source/server/uk/org/iscream/cms/server/clientinterface/PacketSorter.java

Comparing projects/cms/source/server/uk/org/iscream/cms/server/clientinterface/PacketSorter.java (file contents):
Revision 1.19 by tdb, Sat May 18 18:16:01 2002 UTC vs.
Revision 1.24 by tdb, Sun Aug 1 10:40:48 2004 UTC

#	Line 1 | Line 1
1		/*
2		* i-scream central monitoring system
3	+	* http://www.i-scream.org
4		* Copyright (C) 2000-2002 i-scream
5		*
6		* This program is free software; you can redistribute it and/or
#	Line 21 | Line 22
22		package uk.org.iscream.cms.server.clientinterface;
23
24		//---IMPORTS---
25	<	import uk.org.iscream.cms.server.util.*;
25	>	import uk.org.iscream.cms.util.*;
26		import uk.org.iscream.cms.server.componentmanager.*;
27		import uk.org.iscream.cms.server.core.*;
28		import java.util.*;
#	Line 109 | Line 110 | class PacketSorter extends Thread {
110		* loop forever processing and sending data.
111		*/
112		public void run() {
112	–	XMLPacketMaker xmlPacketMaker = new XMLPacketMaker();
113		int qID = _queue.getQueue();
114		while(true) {
115		// attempt to get some data from the Queue
#	Line 124 | Line 124 | class PacketSorter extends Thread {
124		XMLPacket packet = null;
125
126		try {
127	<	packet = xmlPacketMaker.createXMLPacket(xml);
127	>	packet = _xmlCache.getXMLPacket(xml);
128		} catch(InvalidXMLException e) {
129		_logger.write(toString(), Logger.ERROR, "Invalid XML: "+e);
130		// skip the rest of this loop iteration
#	Line 133 | Line 133 | class PacketSorter extends Thread {
133
134		String packetType = packet.getParam("packet.attributes.type");
135		// check if we need to send it regardless
136	<	if(packetType.equals("data") || packetType.equals("heartbeat")) {
136	>	if(packetType.equals("data")) {
137		String host = packet.getParam("packet.attributes.machine_name");
138
139		// look in the hostMap to see if anyone wants this data
#	Line 267 | Line 267 | class PacketSorter extends Thread {
267		* Overrides the {@link java.lang.Object#toString() Object.toString()}
268		* method to provide clean logging (every class should have this).
269		*
270	<	* This uses the uk.org.iscream.cms.server.util.NameFormat class
270	>	* This uses the uk.org.iscream.cms.util.NameFormat class
271		* to format the toString()
272		*
273		* @return the name of this class and its CVS revision
#	Line 334 | Line 334 | class PacketSorter extends Thread {
334		* A list of all hosts.
335		*/
336		private LinkedList _allHostsList;
337	+
338	+	/**
339	+	* A reference to the XMLCache in use
340	+	*/
341	+	private XMLCache _xmlCache = XMLCache.getInstance();
342
343		//---STATIC ATTRIBUTES---
344

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines