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.17 by ajm, Sun Feb 11 20:35:26 2001 UTC vs.
Revision 1.32 by tdb, Wed Feb 5 16:43:47 2003 UTC

# Line 1 | Line 1
1 + /*
2 + * i-scream central monitoring system
3 + * http://www.i-scream.org.uk
4 + * Copyright (C) 2000-2002 i-scream
5 + *
6 + * This program is free software; you can redistribute it and/or
7 + * modify it under the terms of the GNU General Public License
8 + * as published by the Free Software Foundation; either version 2
9 + * of the License, or (at your option) any later version.
10 + *
11 + * This program is distributed in the hope that it will be useful,
12 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14 + * GNU General Public License for more details.
15 + *
16 + * You should have received a copy of the GNU General Public License
17 + * along with this program; if not, write to the Free Software
18 + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
19 + */
20 +
21   //---PACKAGE DECLARATION---
22 < package uk.ac.ukc.iscream.filter;
22 > package uk.org.iscream.cms.server.filter;
23  
24   //---IMPORTS---
25 < import uk.ac.ukc.iscream.core.*;
26 < import uk.ac.ukc.iscream.filter.*;
27 < import uk.ac.ukc.iscream.componentmanager.*;
25 > import uk.org.iscream.cms.server.core.*;
26 > import uk.org.iscream.cms.server.filter.*;
27 > import uk.org.iscream.cms.server.componentmanager.*;
28   import java.net.Socket;
9 – import java.io.InputStream;
10 – import java.io.OutputStream;
11 – import java.io.IOException;
29   import java.io.*;
30 < import uk.ac.ukc.iscream.util.*;
30 > import java.util.Random;
31 > import uk.org.iscream.cms.util.*;
32  
33   /**
34   * This provides Host heartbeat functionality
# Line 39 | Line 57 | class TCPReaderInit extends Thread {
57       * @throws IOException if something goes badly wrong
58       */
59      public TCPReaderInit(Socket socket, Queue queue) throws IOException {
60 +        // set the Thread name
61 +        setName("filter.TCPReaderInit");
62 +        
63          _socket = socket;
64          _queue = queue;
65          // setup the reader & writer
# Line 56 | Line 77 | class TCPReaderInit extends Thread {
77       */
78      public void run() {
79          try {
80 <            //variables
81 <            String filelist = "";
61 <            String lastModified = "";
62 <            String inBound = "";
80 >            // get an instance of the KeyManager
81 >            KeyManager keyman = KeyManager.getInstance();
82              
83 <            inBound = _socketIn.readLine();
84 <            if(!inBound.equals("HEARTBEAT")) {
85 <                _socketOut.println("ERROR");
67 <                throw new IOException("protocol error - expecting:HEARTBEAT got:" + inBound);
68 <            } else {
69 <                _socketOut.println("OK");
70 <            }
83 >            // get some information about the host
84 >            String hostname = _socket.getInetAddress().getHostName().toLowerCase();
85 >            String ipadd = _socket.getInetAddress().getHostAddress();
86              
87 <            inBound = _socketIn.readLine();
88 <            if(!inBound.equals("CONFIG")) {
74 <                _socketOut.println("ERROR");
75 <                throw new IOException("protocol error - expecting:CONFIG got:" + inBound);
76 <            } else {
77 <                _socketOut.println("OK");
78 <            }
79 <            
80 <            inBound = _socketIn.readLine();
81 <            filelist = inBound;
87 >            // try for HEARTBEAT
88 >            getInBound("HEARTBEAT");
89              _socketOut.println("OK");
90              
91 <            inBound = _socketIn.readLine();
92 <            lastModified = inBound;
93 <            
94 <            boolean newConfig = _configManager.isModified(filelist, Long.parseLong(lastModified));
95 <            
96 <            if(newConfig) {
97 <                _socketOut.println("ERROR");
91 >            // look for a command:
92 >            // CONFIG - to check config
93 >            // KEY - to get the key
94 >            // ENDHEARTBEAT - to finish            
95 >            String cmd = getInBound();
96 >            while(!cmd.equals("ENDHEARTBEAT")) {
97 >                if(cmd.equals("CONFIG")) {
98 >                    // respond to CONFIG
99 >                    _socketOut.println("OK");
100 >                        
101 >                    // try for {filelist}
102 >                    String filelist = getInBound();
103 >                    _socketOut.println("OK");
104 >                    
105 >                    // try for {lastModified}
106 >                    String lastModified = getInBound();
107 >                    // check to see if a config update has happen
108 >                    boolean newConfig = _configManager.isModified(filelist, Long.parseLong(lastModified));
109 >                    if(newConfig) {
110 >                        // new config !
111 >                        _socketOut.println("ERROR");
112 >                    }
113 >                    else {
114 >                        // nothing has changed
115 >                        _socketOut.println("OK");
116 >                    }
117 >                }
118 >                else if(cmd.equals("KEY")) {
119 >                    // repsond to KEY
120 >                    // generate a key
121 >                    String key = keyman.genKey();
122 >                    // send key to host
123 >                    _socketOut.println(key);
124 >                    // add it to the key manager
125 >                    keyman.addKey(hostname, key);
126 >                }
127 >                else {
128 >                    _socketOut.println("ERROR");
129 >                }
130 >                // get the next command
131 >                cmd = getInBound();
132              }
92 –            else {
93 –                _socketOut.println("OK");
94 –            }
133              
134 <            inBound = _socketIn.readLine();
135 <            if(!inBound.equals("ENDHEARTBEAT")) {
98 <                _socketOut.println("ERROR");
99 <                throw new IOException("protocol error - expecting:ENDHEARTBEAT got:" + inBound);
100 <            } else {
101 <                _socketOut.println("OK");
102 <            }
103 <
104 <            String date = new Long(System.currentTimeMillis()).toString();
105 <            String hostname = _socket.getInetAddress().getHostName();
106 <            String ipadd = _socket.getInetAddress().getHostAddress();
134 >            // respond to ENDHEARTBEAT
135 >            _socketOut.println("OK");
136              
137 +            // work out some information for our heartbeat packet
138 +            String date = new Long(System.currentTimeMillis()/((long) 1000)).toString(); //seconds
139 +            
140              // run the service checks for this host
141              _logger.write(toString(), Logger.DEBUG, "Running service checks");
142              String checks = PluginServiceCheckManager.getInstance().runServiceChecks(hostname);
# Line 116 | Line 148 | class TCPReaderInit extends Thread {
148              _queue.add(xml);
149              
150          } catch (Exception e) {
151 <            _logger.write(toString(), Logger.ERROR, "ERROR: " + e.getMessage());
151 >            _logger.write(toString(), Logger.ERROR, "ERROR: " + e);
152          }
153          
154          // Disconnect streams & socket
# Line 134 | Line 166 | class TCPReaderInit extends Thread {
166       * Overrides the {@link java.lang.Object#toString() Object.toString()}
167       * method to provide clean logging (every class should have this).
168       *
169 <     * This uses the uk.ac.ukc.iscream.util.NameFormat class
169 >     * This uses the uk.org.iscream.cms.util.NameFormat class
170       * to format the toString()
171       *
172       * @return the name of this class and its CVS revision
# Line 148 | Line 180 | class TCPReaderInit extends Thread {
180  
181   //---PRIVATE METHODS---
182  
183 +    private String getInBound(String expected) throws IOException {
184 +        // grab the input
185 +        String inBound = getInBound();
186 +        // check if it's what we're expecting
187 +        if(!inBound.equals(expected)) {
188 +            throw new IOException("protocol error from "+_socket.getInetAddress().getHostName()+" - expected:"+expected+" got:" + inBound);
189 +        }
190 +        // it should be ok then
191 +        return inBound;
192 +    }
193 +    
194 +    private String getInBound() throws IOException {
195 +        // grab the input
196 +        String inBound = _socketIn.readLine();
197 +        // check for null's, likely disconnection
198 +        if(inBound == null) {
199 +            throw new IOException("got null from host, maybe it died");
200 +        }
201 +        // it's a valid message it seems
202 +        return inBound;
203 +    }
204 +    
205   //---ACCESSOR/MUTATOR METHODS---
206  
207   //---ATTRIBUTES---
# Line 193 | Line 247 | class TCPReaderInit extends Thread {
247       * A reference to our Queue
248       */
249      Queue _queue;
250 +    
251   //---STATIC ATTRIBUTES---
252  
253   }

Diff Legend

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