ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/i-scream/projects/cms/source/host/java/Config.java
(Generate patch)

Comparing projects/cms/source/host/java/Config.java (file contents):
Revision 1.3 by ab11, Thu Nov 30 04:06:52 2000 UTC vs.
Revision 1.8 by ab11, Mon Mar 19 17:38:41 2001 UTC

# Line 8 | Line 8 | import java.io.*;
8  
9   /**
10   * Configurator object for the JavaHost
11 < * Will connect to the configurator manager and collect its specific
11 > * Will connect to the filter manager and collect its specific
12   * configuration
13   *
14   * @author  $Author$
# Line 52 | Line 52 | class Config {
52          myProperties = new HashMap();
53          configChanged = false;
54          
55 +        // time in seconds before first retry
56 +        filterManagerRetryTime = 10;
57      
58          // do the funky jibble
59          connect(serverName, serverPort);
# Line 60 | Line 62 | class Config {
62   //---PUBLIC METHODS---
63  
64      public InetAddress getFilterName(){
65 <        // will return the most recient IP address (if it is dynamic for whatever reason
65 >        // will return the most recent IP address (if it is dynamic for whatever reason)
66          try {
67              return InetAddress.getByName(filterName);
68          }
# Line 74 | Line 76 | class Config {
76      /**
77       * Used to retrieve the port to send UDP packets to on the filter
78       *
79 <     * @return an integer corrisponding to the UDP port of the filter
79 >     * @return an integer corresponding to the UDP port of the filter
80       */
81      public int getFilterUDPPort(){
82          
# Line 84 | Line 86 | class Config {
86      /**
87       * Used to retrieve the port to send TCP heartbeats to on the filter
88       *
89 <     * @return an integer corrisponding to the TCP of the filter
89 >     * @return an integer corresponding to the TCP of the filter
90       */    
91      public int getFilterTCPPort(){
92          
# Line 116 | Line 118 | class Config {
118          Socket mySocket;
119          configChanged = false;
120          
121 <        System.out.println("Establishing connection with config manager");
121 >        System.out.println("Establishing connection with filter manager");
122          
123          // might throw a UnknownHostException
124          try {
# Line 129 | Line 131 | class Config {
131                  // everything is fine
132                  // sendCommand("LASTMODIFIED");
133                  lastModified = sendCommand("LASTMODIFIED");
134 <                
134 >                    
135                  fileList = sendCommand("FILELIST");
136 +                
137 +                fQDN = sendCommand("FQDN");                
138                  // get all the properties
139                  if ( numProperties > 0 ){
140                          // sendCommand("CONFIG");
# Line 146 | Line 150 | class Config {
150                  filterName = tok.nextToken();
151                  filterUDPPort = Integer.parseInt(tok.nextToken());
152                  filterTCPPort = Integer.parseInt(tok.nextToken());
153 <                    
153 >                                    
154                  sendCommand("END");        
155                  
156              }
# Line 154 | Line 158 | class Config {
158          
159              // close the socket
160              mySocket.close();
161 <            System.out.println("Completed communication with config manager");
161 >            System.out.println("Completed communication with filter manager");
162          
163          }
164          catch ( UnknownHostException e ){
# Line 164 | Line 168 | class Config {
168          catch ( IOException e ){
169              // what to do
170              System.out.println("Unable to read from socket, might not be open");
171 +            System.out.println("Retrying in "+filterManagerRetryTime+" seconds");
172 +            configChanged = true;
173 +            try {
174 +                Thread.sleep(filterManagerRetryTime*1000);
175 +            }
176 +            catch( InterruptedException f ){
177 +                System.out.println("Sleep interrupted");
178 +            }
179 +            filterManagerRetryTime = filterManagerRetryTime * 2;
180 +            // warning this WILL cause a stack overflow after a while..
181 +            // need to fix it.
182 +            connect(serverName, serverPort);
183          }
184              
185      } // connect
# Line 198 | Line 214 | class Config {
214          catch ( IOException e ){
215              // what to do
216              System.out.println("Unable to read from socket, might not be open");
217 +            System.out.println("Re-establishing contact with filter manager");
218 +            configChanged = true;
219          }
220      }
221  
# Line 229 | Line 247 | class Config {
247      private boolean configChanged;
248      private String lastModified;
249      private String fileList;
250 +    private String fQDN;
251      private int numProperties;
252      private HashMap myProperties;
253      private String filterName;
# Line 237 | Line 256 | class Config {
256      private ArrayList aList;
257      private BufferedReader socketIn;
258      private PrintWriter socketOut;
259 +    private int filterManagerRetryTime;
260      
261  
262  
263   //---STATIC ATTRIBUTES---
264  
265 < } // class
265 > } // class

Diff Legend

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