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.21 by tdb, Tue Mar 13 02:19:46 2001 UTC vs.
Revision 1.27 by tdb, Thu Mar 21 17:44:51 2002 UTC

# Line 1 | Line 1
1   //---PACKAGE DECLARATION---
2 < package uk.ac.ukc.iscream.filter;
2 > package uk.org.iscream.cms.server.filter;
3  
4   //---IMPORTS---
5 < import uk.ac.ukc.iscream.core.*;
6 < import uk.ac.ukc.iscream.filter.*;
7 < import uk.ac.ukc.iscream.componentmanager.*;
5 > import uk.org.iscream.cms.server.core.*;
6 > import uk.org.iscream.cms.server.filter.*;
7 > import uk.org.iscream.cms.server.componentmanager.*;
8   import java.net.Socket;
9 – import java.io.InputStream;
10 – import java.io.OutputStream;
11 – import java.io.IOException;
9   import java.io.*;
10 < import uk.ac.ukc.iscream.util.*;
10 > import java.util.Random;
11 > import uk.org.iscream.cms.server.util.*;
12  
13   /**
14   * This provides Host heartbeat functionality
# Line 27 | Line 25 | class TCPReaderInit extends Thread {
25       */
26      public final String REVISION = "$Revision$";
27      
28 +    /**
29 +     * The set of characters to be used for our key
30 +     */
31 +    private final char[] KEYSET = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789".toCharArray();
32 +    
33 +    /**
34 +     * The length of our key
35 +     */
36 +    private final int KEYLEN = 15;
37 +    
38   //---STATIC METHODS---
39  
40   //---CONSTRUCTORS---
# Line 59 | Line 67 | class TCPReaderInit extends Thread {
67       */
68      public void run() {
69          try {
70 <            //variables
71 <            String filelist = "";
64 <            String lastModified = "";
65 <            String inBound = "";
70 >            // get an instance of the KeyManager
71 >            KeyManager keyman = KeyManager.getInstance();
72              
73 <            inBound = _socketIn.readLine();
74 <            if(!inBound.equals("HEARTBEAT")) {
75 <                _socketOut.println("ERROR");
70 <                throw new IOException("protocol error - expecting:HEARTBEAT got:" + inBound);
71 <            } else {
72 <                _socketOut.println("OK");
73 <            }
73 >            // get some information about the host
74 >            String hostname = _socket.getInetAddress().getHostName().toLowerCase();
75 >            String ipadd = _socket.getInetAddress().getHostAddress();
76              
77 <            inBound = _socketIn.readLine();
78 <            if(!inBound.equals("CONFIG")) {
77 <                _socketOut.println("ERROR");
78 <                throw new IOException("protocol error - expecting:CONFIG got:" + inBound);
79 <            } else {
80 <                _socketOut.println("OK");
81 <            }
82 <            
83 <            inBound = _socketIn.readLine();
84 <            filelist = inBound;
77 >            // try for HEARTBEAT
78 >            getInBound("HEARTBEAT");
79              _socketOut.println("OK");
80              
81 <            inBound = _socketIn.readLine();
82 <            lastModified = inBound;
83 <            
84 <            boolean newConfig = _configManager.isModified(filelist, Long.parseLong(lastModified));
85 <            
86 <            if(newConfig) {
87 <                _socketOut.println("ERROR");
81 >            // look for a command:
82 >            // CONFIG - to check config
83 >            // KEY - to get the key
84 >            // ENDHEARTBEAT - to finish            
85 >            String cmd = getInBound();
86 >            while(!cmd.equals("ENDHEARTBEAT")) {
87 >                if(cmd.equals("CONFIG")) {
88 >                    // respond to CONFIG
89 >                    _socketOut.println("OK");
90 >                        
91 >                    // try for {filelist}
92 >                    String filelist = getInBound();
93 >                    _socketOut.println("OK");
94 >                    
95 >                    // try for {lastModified}
96 >                    String lastModified = getInBound();
97 >                    // check to see if a config update has happen
98 >                    boolean newConfig = _configManager.isModified(filelist, Long.parseLong(lastModified));
99 >                    if(newConfig) {
100 >                        // new config !
101 >                        _socketOut.println("ERROR");
102 >                    }
103 >                    else {
104 >                        // nothing has changed
105 >                        _socketOut.println("OK");
106 >                    }
107 >                }
108 >                else if(cmd.equals("KEY")) {
109 >                    // repsond to KEY
110 >                    // generate a key
111 >                    String key = keyman.genKey();
112 >                    // add it to the key manager
113 >                    keyman.addKey(hostname, key);
114 >                    _socketOut.println(key);
115 >                }
116 >                else {
117 >                    _socketOut.println("ERROR");
118 >                }
119 >                // get the next command
120 >                cmd = getInBound();
121              }
95 –            else {
96 –                _socketOut.println("OK");
97 –            }
122              
123 <            inBound = _socketIn.readLine();
124 <            if(!inBound.equals("ENDHEARTBEAT")) {
101 <                _socketOut.println("ERROR");
102 <                throw new IOException("protocol error - expecting:ENDHEARTBEAT got:" + inBound);
103 <            } else {
104 <                _socketOut.println("OK");
105 <            }
106 <
107 <            String date = new Long(System.currentTimeMillis()/((long) 1000)).toString();
108 <            String hostname = _socket.getInetAddress().getHostName().toLowerCase();
109 <            String ipadd = _socket.getInetAddress().getHostAddress();
123 >            // respond to ENDHEARTBEAT
124 >            _socketOut.println("OK");
125              
126 +            // work out some information for our heartbeat packet
127 +            String date = new Long(System.currentTimeMillis()/((long) 1000)).toString(); //seconds
128 +            
129              // run the service checks for this host
130              _logger.write(toString(), Logger.DEBUG, "Running service checks");
131              String checks = PluginServiceCheckManager.getInstance().runServiceChecks(hostname);
# Line 137 | Line 155 | class TCPReaderInit extends Thread {
155       * Overrides the {@link java.lang.Object#toString() Object.toString()}
156       * method to provide clean logging (every class should have this).
157       *
158 <     * This uses the uk.ac.ukc.iscream.util.NameFormat class
158 >     * This uses the uk.org.iscream.cms.server.util.NameFormat class
159       * to format the toString()
160       *
161       * @return the name of this class and its CVS revision
# Line 151 | Line 169 | class TCPReaderInit extends Thread {
169  
170   //---PRIVATE METHODS---
171  
172 +    private String getInBound(String expected) throws IOException {
173 +        // grab the input
174 +        String inBound = getInBound();
175 +        // check if it's what we're expecting
176 +        if(!inBound.equals(expected)) {
177 +            throw new IOException("protocol error from "+_socket.getInetAddress().getHostName()+" - expected:"+expected+" got:" + inBound);
178 +        }
179 +        // it should be ok then
180 +        return inBound;
181 +    }
182 +    
183 +    private String getInBound() throws IOException {
184 +        // grab the input
185 +        String inBound = _socketIn.readLine();
186 +        // check for null's, likely disconnection
187 +        if(inBound == null) {
188 +            throw new IOException("got null from host, maybe it died");
189 +        }
190 +        // it's a valid message it seems
191 +        return inBound;
192 +    }
193 +    
194   //---ACCESSOR/MUTATOR METHODS---
195  
196   //---ATTRIBUTES---
# Line 196 | Line 236 | class TCPReaderInit extends Thread {
236       * A reference to our Queue
237       */
238      Queue _queue;
239 +    
240   //---STATIC ATTRIBUTES---
241  
242   }

Diff Legend

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