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.7 by tdb, Wed Jan 24 01:25:59 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 146 | Line 148 | class Config {
148                  filterName = tok.nextToken();
149                  filterUDPPort = Integer.parseInt(tok.nextToken());
150                  filterTCPPort = Integer.parseInt(tok.nextToken());
151 <                    
151 >                                    
152                  sendCommand("END");        
153                  
154              }
# Line 154 | Line 156 | class Config {
156          
157              // close the socket
158              mySocket.close();
159 <            System.out.println("Completed communication with config manager");
159 >            System.out.println("Completed communication with filter manager");
160          
161          }
162          catch ( UnknownHostException e ){
# Line 164 | Line 166 | class Config {
166          catch ( IOException e ){
167              // what to do
168              System.out.println("Unable to read from socket, might not be open");
169 +            System.out.println("Retrying in "+filterManagerRetryTime+" seconds");
170 +            configChanged = true;
171 +            try {
172 +                Thread.sleep(filterManagerRetryTime*1000);
173 +            }
174 +            catch( InterruptedException f ){
175 +                System.out.println("Sleep interrupted");
176 +            }
177 +            filterManagerRetryTime = filterManagerRetryTime * 2;
178 +            // warning this WILL cause a stack overflow after a while..
179 +            // need to fix it.
180 +            connect(serverName, serverPort);
181          }
182              
183      } // connect
# Line 198 | Line 212 | class Config {
212          catch ( IOException e ){
213              // what to do
214              System.out.println("Unable to read from socket, might not be open");
215 +            System.out.println("Re-establishing contact with filter manager");
216 +            configChanged = true;
217          }
218      }
219  
# Line 237 | Line 253 | class Config {
253      private ArrayList aList;
254      private BufferedReader socketIn;
255      private PrintWriter socketOut;
256 +    private int filterManagerRetryTime;
257      
258  
259  
260   //---STATIC ATTRIBUTES---
261  
262 < } // class
262 > } // class

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines