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
(Generate patch)

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.15 by tdb, Wed Feb 7 13:47:11 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();
# Line 100 | Line 106 | class TCPReaderInit extends Thread {
106              String ipadd = _socket.getInetAddress().getHostAddress();
107              String xml = "<packet type=\"heartbeat\" machine_name=\""+hostname+"\" date=\""+date+"\" ip=\""+ipadd+"\"></packet>";
108              
109 <            FilterThread t = new FilterThread(xml, _parent);
104 <            t.start();
109 >            _queue.add(xml);
110              
111          } catch (Exception e) {
112              _logger.write(toString(), Logger.ERROR, "ERROR: " + e.getMessage());
113          }
114          
110 –        _socketOut.flush();
115          // Disconnect streams & socket
116          try {
117              _socketIn.close();
# Line 116 | Line 120 | class TCPReaderInit extends Thread {
120          } catch (IOException e) {
121              _logger.write(toString(), Logger.ERROR, "exception on socket close");
122          }
123 <        _logger.write(toString(), Logger.SYSMSG, "finished");
123 >        _logger.write(toString(), Logger.DEBUG, "finished");
124      }
125      
126      /**
# Line 179 | Line 183 | class TCPReaderInit extends Thread {
183      PrintWriter _socketOut;
184      
185      /**
186 <     * A reference to our parent
186 >     * A reference to our Queue
187       */
188 <    Filter _parent;
188 >    Queue _queue;
189   //---STATIC ATTRIBUTES---
190  
191   }

Diff Legend

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