ViewVC Help

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

root/i-scream/projects/cms/source/server/uk/org/iscream/cms/server/filter/TCPReaderInit.java

Comparing projects/cms/source/server/uk/org/iscream/cms/server/filter/TCPReaderInit.java (file contents):
Revision 1.10 by ajm, Wed Dec 13 13:36:46 2000 UTC vs.
Revision 1.20 by tdb, Sun Mar 4 05:24:08 2001 UTC

#	Line 4 | Line 4 | package uk.ac.ukc.iscream.filter;
4		//---IMPORTS---
5		import uk.ac.ukc.iscream.core.*;
6		import uk.ac.ukc.iscream.filter.*;
7	+	import uk.ac.ukc.iscream.componentmanager.*;
8		import java.net.Socket;
9		import java.io.InputStream;
10		import java.io.OutputStream;
#	Line 29 | Line 30 | class TCPReaderInit extends Thread {
30		//---STATIC METHODS---
31
32		//---CONSTRUCTORS---
33	<
34	<	public TCPReaderInit(Socket socket, Filter parent) throws IOException {
33	>
34	>	/**
35	>	* Construct a new TCPReaderInit.
36	>	*
37	>	* @param socket the Socket to which the host is connected
38	>	* @param queue the Queue to which we'll add data
39	>	* @throws IOException if something goes badly wrong
40	>	*/
41	>	public TCPReaderInit(Socket socket, Queue queue) throws IOException {
42		_socket = socket;
43	<	_parent = parent;
43	>	_queue = queue;
44	>	// setup the reader & writer
45		_socketIn = new BufferedReader(new InputStreamReader(_socket.getInputStream()));
46	<	_socketOut = new PrintWriter(_socket.getOutputStream());
46	>	_socketOut = new PrintWriter(_socket.getOutputStream(), true);
47		_logger.write(toString(), Logger.SYSINIT, "created");
48		}
49
50		//---PUBLIC METHODS---
51	<
51	>
52	>	/**
53	>	* Main run method. Will communicate with the host, inform it
54	>	* if any updates to it's configuration are needed, and send
55	>	* a heartbeat packet into the system.
56	>	*/
57		public void run() {
58		try {
59		//variables
#	Line 50 | Line 64 | class TCPReaderInit extends Thread {
64		inBound = _socketIn.readLine();
65		if(!inBound.equals("HEARTBEAT")) {
66		_socketOut.println("ERROR");
53	–	_socketOut.flush();
67		throw new IOException("protocol error - expecting:HEARTBEAT got:" + inBound);
68		} else {
69		_socketOut.println("OK");
57	–	_socketOut.flush();
70		}
71
72		inBound = _socketIn.readLine();
73		if(!inBound.equals("CONFIG")) {
74		_socketOut.println("ERROR");
63	–	_socketOut.flush();
75		throw new IOException("protocol error - expecting:CONFIG got:" + inBound);
76		} else {
77		_socketOut.println("OK");
67	–	_socketOut.flush();
78		}
79
80		inBound = _socketIn.readLine();
81		filelist = inBound;
82		_socketOut.println("OK");
73	–	_socketOut.flush();
83
84		inBound = _socketIn.readLine();
85		lastModified = inBound;
#	Line 83 | Line 92 | class TCPReaderInit extends Thread {
92		else {
93		_socketOut.println("OK");
94		}
86	–	_socketOut.flush();
95
96		inBound = _socketIn.readLine();
97		if(!inBound.equals("ENDHEARTBEAT")) {
98		_socketOut.println("ERROR");
91	–	_socketOut.flush();
99		throw new IOException("protocol error - expecting:ENDHEARTBEAT got:" + inBound);
100		} else {
101		_socketOut.println("OK");
95	–	_socketOut.flush();
102		}
103
104	<	String date = new Long(System.currentTimeMillis()).toString();
105	<	String hostname = _socket.getInetAddress().getHostName();
104	>	String date = new Long(System.currentTimeMillis()/((long) 1000)).toString();
105	>	String hostname = _socket.getInetAddress().getHostName().toLowerCase();
106		String ipadd = _socket.getInetAddress().getHostAddress();
101	–	String xml = "<packet type=\"heartbeat\" machine_name=\""+hostname+"\" date=\""+date+"\" ip=\""+ipadd+"\"></packet>";
107
108	<	FilterThread t = new FilterThread(xml, _parent);
109	<	t.start();
108	>	// run the service checks for this host
109	>	_logger.write(toString(), Logger.DEBUG, "Running service checks");
110	>	String checks = PluginServiceCheckManager.getInstance().runServiceChecks(hostname);
111
112	+	// build the heartbeat packet
113	+	String xml = "<packet type=\"heartbeat\" machine_name=\""+hostname+"\" date=\""+date+"\" ip=\""+ipadd+"\">" + checks + "</packet>";
114	+
115	+	// get it to be sent on
116	+	_queue.add(xml);
117	+
118		} catch (Exception e) {
119	<	_logger.write(toString(), Logger.ERROR, "ERROR: " + e.getMessage());
119	>	_logger.write(toString(), Logger.ERROR, "ERROR: " + e);
120		}
121
110	–	_socketOut.flush();
122		// Disconnect streams & socket
123		try {
124		_socketIn.close();
#	Line 116 | Line 127 | class TCPReaderInit extends Thread {
127		} catch (IOException e) {
128		_logger.write(toString(), Logger.ERROR, "exception on socket close");
129		}
130	<	_logger.write(toString(), Logger.SYSMSG, "finished");
130	>	_logger.write(toString(), Logger.DEBUG, "finished");
131		}
132
133		/**
#	Line 179 | Line 190 | class TCPReaderInit extends Thread {
190		PrintWriter _socketOut;
191
192		/**
193	<	* A reference to our parent
193	>	* A reference to our Queue
194		*/
195	<	Filter _parent;
195	>	Queue _queue;
196		//---STATIC ATTRIBUTES---
197
198		}

Diff Legend

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