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.9 by ajm, Thu Nov 30 02:38:09 2000 UTC vs.
Revision 1.21 by tdb, Tue Mar 13 02:19:46 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;
11   import java.io.IOException;
12   import java.io.*;
12 import org.omg.CORBA.*;
13 import org.omg.CosNaming.*;
13   import uk.ac.ukc.iscream.util.*;
14  
15   /**
16 < * <ONE LINE DESCRIPTION>
18 < * <DETAILED DESCRIPTION>
16 > * This provides Host heartbeat functionality
17   *
18   * @author  $Author$
19   * @version $Id$
# Line 32 | 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 >        // set the Thread name
43 >        setName("filter.TCPReaderInit");
44 >        
45          _socket = socket;
46 <        _parent = parent;
46 >        _queue = queue;
47 >        // setup the reader & writer
48          _socketIn = new BufferedReader(new InputStreamReader(_socket.getInputStream()));
49 <        _socketOut = new PrintWriter(_socket.getOutputStream());
49 >        _socketOut = new PrintWriter(_socket.getOutputStream(), true);
50          _logger.write(toString(), Logger.SYSINIT, "created");
51      }
52      
53   //---PUBLIC METHODS---
54 <
54 >    
55 >    /**
56 >     * Main run method. Will communicate with the host, inform it
57 >     * if any updates to it's configuration are needed, and send
58 >     * a heartbeat packet into the system.
59 >     */
60      public void run() {
61          try {
62              //variables
# Line 53 | Line 67 | class TCPReaderInit extends Thread {
67              inBound = _socketIn.readLine();
68              if(!inBound.equals("HEARTBEAT")) {
69                  _socketOut.println("ERROR");
56                _socketOut.flush();
70                  throw new IOException("protocol error - expecting:HEARTBEAT got:" + inBound);
71              } else {
72                  _socketOut.println("OK");
60                _socketOut.flush();
73              }
74              
75              inBound = _socketIn.readLine();
76              if(!inBound.equals("CONFIG")) {
77                  _socketOut.println("ERROR");
66                _socketOut.flush();
78                  throw new IOException("protocol error - expecting:CONFIG got:" + inBound);
79              } else {
80                  _socketOut.println("OK");
70                _socketOut.flush();
81              }
82              
83              inBound = _socketIn.readLine();
84              filelist = inBound;
85              _socketOut.println("OK");
76            _socketOut.flush();
86              
87              inBound = _socketIn.readLine();
88              lastModified = inBound;
# Line 86 | Line 95 | class TCPReaderInit extends Thread {
95              else {
96                  _socketOut.println("OK");
97              }
89            _socketOut.flush();
98              
99              inBound = _socketIn.readLine();
100              if(!inBound.equals("ENDHEARTBEAT")) {
101                  _socketOut.println("ERROR");
94                _socketOut.flush();
102                  throw new IOException("protocol error - expecting:ENDHEARTBEAT got:" + inBound);
103              } else {
104                  _socketOut.println("OK");
98                _socketOut.flush();
105              }
106  
107 <            String date = new Long(System.currentTimeMillis()).toString();
108 <            String hostname = _socket.getInetAddress().getHostName();
107 >            String date = new Long(System.currentTimeMillis()/((long) 1000)).toString();
108 >            String hostname = _socket.getInetAddress().getHostName().toLowerCase();
109              String ipadd = _socket.getInetAddress().getHostAddress();
104            String xml = "<packet type=\"heartbeat\" machine_name=\""+hostname+"\" date=\""+date+"\" ip=\""+ipadd+"\"></packet>";
110              
111 <            FilterThread t = new FilterThread(xml, _parent);
112 <            t.start();
111 >            // run the service checks for this host
112 >            _logger.write(toString(), Logger.DEBUG, "Running service checks");
113 >            String checks = PluginServiceCheckManager.getInstance().runServiceChecks(hostname);
114              
115 +            // build the heartbeat packet
116 +            String xml = "<packet type=\"heartbeat\" machine_name=\""+hostname+"\" date=\""+date+"\" ip=\""+ipadd+"\">" + checks + "</packet>";
117 +            
118 +            // get it to be sent on
119 +            _queue.add(xml);
120 +            
121          } catch (Exception e) {
122 <            _logger.write(toString(), Logger.ERROR, "ERROR: " + e.getMessage());
122 >            _logger.write(toString(), Logger.ERROR, "ERROR: " + e);
123          }
124          
113        _socketOut.flush();
125          // Disconnect streams & socket
126          try {
127              _socketIn.close();
# Line 119 | Line 130 | class TCPReaderInit extends Thread {
130          } catch (IOException e) {
131              _logger.write(toString(), Logger.ERROR, "exception on socket close");
132          }
133 <        _logger.write(toString(), Logger.SYSMSG, "finished");
133 >        _logger.write(toString(), Logger.DEBUG, "finished");
134      }
135      
136      /**
137       * Overrides the {@link java.lang.Object#toString() Object.toString()}
138       * method to provide clean logging (every class should have this).
139       *
140 +     * This uses the uk.ac.ukc.iscream.util.NameFormat class
141 +     * to format the toString()
142 +     *
143       * @return the name of this class and its CVS revision
144       */
145      public String toString() {
146 <        return this.getClass().getName() + "{" + _socket.getInetAddress().getHostName()
147 <         + "}(" + REVISION.substring(11, REVISION.length() - 2) + ")";
148 <        
146 >        return FormatName.getName(
147 >            _name,
148 >            getClass().getName(),
149 >            REVISION);
150      }
151  
152   //---PRIVATE METHODS---
# Line 140 | Line 155 | class TCPReaderInit extends Thread {
155  
156   //---ATTRIBUTES---
157  
158 +    /**
159 +     * A reference to the configuration manager
160 +     */
161      ConfigurationManager _configManager = ReferenceManager.getInstance().getCM();
162 <    Logger _logger = ReferenceManager.getInstance().getLogger();
162 >    
163 >    /**
164 >     * This is the friendly identifier of the
165 >     * component this class is running in.
166 >     * eg, a Filter may be called "filter1",
167 >     * If this class does not have an owning
168 >     * component,  a name from the configuration
169 >     * can be placed here.  This name could also
170 >     * be changed to null for utility classes.
171 >     */
172 >    private String _name = FilterMain.NAME;
173 >
174 >    /**
175 >     * This holds a reference to the
176 >     * system logger that is being used.
177 >     */
178 >    private Logger _logger = ReferenceManager.getInstance().getLogger();
179 >    
180 >    /**
181 >     * The socket we are talking on
182 >     */
183      Socket _socket;
184 +    
185 +    /**
186 +     * The input from the socket
187 +     */
188      BufferedReader _socketIn;
189 +    
190 +    /**
191 +     * The output from the socket
192 +     */
193      PrintWriter _socketOut;
194 <    Filter _parent;
194 >    
195 >    /**
196 >     * A reference to our Queue
197 >     */
198 >    Queue _queue;
199   //---STATIC ATTRIBUTES---
200  
201   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines