Changeset 67

Timestamp:

11/12/05 23:11:05 (5 years ago)

Author:

dsandler

Message:

Big change to the way status is reported during node startup.

ClientStatus? has been moved to net.feedtree.core.Client, where everyone can
contribute to it. It's static, unfortunately, but this allows us to observe
problems during the *construction* of a Client object.

GUI application: Messages are reported to the screen. Errors are either
transient (in which case they are reported like other status messages) or
fatal (in which case they result in a dialog and a System.exit()).

Fixes:

#25 FeedTreeProxy GUI should tell you immediately if firewall/NAT settings

are wrong

#26 GUI doesn't give enough startup feedback

Files:

• feedtree/trunk/src/net/feedtree/core/client/Client.java (modified) (12 diffs)
• feedtree/trunk/src/net/feedtree/proxyapp/WebProxyClient.java (modified) (4 diffs)
• feedtree/trunk/src/net/feedtree/proxyapp/gui/AppControl.java (modified) (5 diffs)
• feedtree/trunk/src/net/feedtree/proxyapp/gui/AppGUI.java (modified) (3 diffs)

feedtree/trunk/src/net/feedtree/core/client/Client.java

@@ -123 +123 @@
-    }
-    
+    // ------------------------------------------------------------
+    public static class ClientStatus extends Observable {
+        public static final int STATUS_NOT_STARTED = 0;
+        public static final int STATUS_STARTING = 1;
+        public static final int STATUS_RUNNING = 1000;
+        public static final int STATUS_ERROR = -1;
+        public static final int STATUS_FATAL_ERROR = -1000;
+        
+        public Client client = null;
+        public int value = STATUS_NOT_STARTED;
+        public String message = "";
+        public ClientStatus() { }
+        protected void setClient (Client client) { 
+            this.client = client; 
+        }
+        public void notifyStatus(int status) { 
+            notifyStatus(status, "");
+        }
+        public void notifyStatus(int status, String message) { 
+            this.value = status;
+            this.message = message;
+            setChanged();
+            notifyObservers(new Integer(status));
+        }
+    };
+
+    protected static ClientStatus status = new ClientStatus();
+
+    public static ClientStatus clientStatus() { return status; }
+    
-    // ------------------------------------------------------------
-    protected class Responder implements Application {
@@ -210 +240 @@
-    public static Node start_node(int port, String bootHost, int bootPort, boolean waitForReady) {
-        Node node = null;
+
+        status.notifyStatus(ClientStatus.STATUS_STARTING,
+                "Starting FeedTree client");
-        
-        Environment pastryEnv = new Environment();
@@ -223 +256 @@
-        } catch (IOException exc) {
-            Logger.global.severe("error: couldn't create node factory; bailing");
-
+
+
+
+
-        }
-
@@ -230 +266 @@
-            if (attempts == 0) {
-                Logger.global.warning("[Failed to bootstrap node 5 times. Exiting.]");
-
+
+
+
-            }
-
@@ -251 +289 @@
-                            = new InetSocketAddress(bootHostList[i], bootPort);
-                    }
-
+
+
+
+
-                    InetAddress natAddr = NAT.findNatAddress(
-                            port, bootSocketList, pastryEnv);
@@ -261 +302 @@
-                        + bootHost + ":" + bootPort + "]");
-                        
+                    status.notifyStatus(ClientStatus.STATUS_STARTING,
+                            "Contacting bootstrap host");
+                                
-                    node = factory.newNode(
-                        factory.getNodeHandle(bootSocketList[0]),
@@ -266 +310 @@
-                } catch (java.io.StreamCorruptedException exc) {
-                    Logger.global.severe("Stream corruption error while finding bootstrap.  Sleeping and trying again.");
+                    status.notifyStatus(ClientStatus.STATUS_ERROR,
+                            "Network error; re-trying");
+
-                    if (node != null && node instanceof SocketPastryNode) {
-                        ((PastryNode)node).destroy();
@@ -274 +321 @@
-                    }
-                    continue;
+                } catch (java.net.UnknownHostException exc) {
+                    status.notifyStatus(ClientStatus.STATUS_FATAL_ERROR,
+                            "Bootstrap host unknown: " + bootHost);
+                    
+                    return null;
-                } catch (Exception exc) {
-                    Logger.global.severe("Unexpected exception while finding bootstrap: " + exc);
-                    exc.printStackTrace();
-                    Logger.global.severe("Exiting.");
-
+
+
+
+
+
+
-                }
-            } else {
-                Logger.global.fine("[No bootstrap, starting new ring]");
-    
+                status.notifyStatus(ClientStatus.STATUS_STARTING,
+                        "Starting new network");
+                    
-                node = factory.newNode(null);
-
@@ -288 +348 @@
-                    Logger.global.warning("[Could not start node; perhaps one is already running?]");
-                    Logger.global.warning("Exiting.");
-
+
+
+
+
+
-                }
-            }
@@ -294 +358 @@
-            Logger.global.fine("[Created node: " + node + "]");
-
+            status.notifyStatus(ClientStatus.STATUS_STARTING,
+                    "Created network node");
+
-            if (waitForReady) {
+                status.notifyStatus(ClientStatus.STATUS_STARTING,
+                        "Waiting for node to join network");
+
-                synchronized (node) {
-                    int waits = 12;
@@ -300 +370 @@
-                        if (waits == 0) {
-                            Logger.global.info("[Failed to bootstrap node into network after 60 sec.  Scrapping node and re-starting in 5-15 sec.]");
+
+                            status.notifyStatus(ClientStatus.STATUS_ERROR,
+                                    "Failed to connect; re-trying shortly");
+
-                            ((PastryNode)node).destroy();
-                            try {
@@ -318 +392 @@
-        }
-        
+        status.notifyStatus(ClientStatus.STATUS_STARTING,
+                "FeedTree client ready");
+
-        return node;
-    }

feedtree/trunk/src/net/feedtree/proxyapp/WebProxyClient.java

@@ -96 +96 @@
-    }
-
-    public static class ClientStatus extends Observable {
-        public static final int STATUS_NOT_STARTED = 0;
-        public static final int STATUS_STARTING = 1;
-        public static final int STATUS_STARTING_NODE = 2;
-        public static final int STATUS_STARTING_PROXIES = 3;
-        public static final int STATUS_READY = 100;
-        public static final int STATUS_ERROR = -1;
-        
-        public WebProxyClient client = null;
-        public int value = STATUS_NOT_STARTED;
-        public String errstr = "";
-        public ClientStatus() { }
-        protected void setClient (WebProxyClient client) { 
-            this.client = client; 
-        }
-        public void notifyStatus(int status) { 
-            notifyStatus(status, "");
-        }
-        public void notifyStatus(int status, String errstr) { 
-            this.value = status;
-            this.errstr = errstr;
-            setChanged();
-            notifyObservers(new Integer(status));
-        }
-    };
-
-    public static ClientStatus status = new ClientStatus();
-    
-    protected class AbandonedFeedReaper {
-        protected Timer m_scheduler = new Timer();
@@ -1145 +1117 @@
-    }
-    public static void main(String[] args) {
-
+
+
-
-        int myPort = Client.PASTRY_PORT;
@@ -1316 +1289 @@
-
-        // Start the node
-        status.notifyStatus(ClientStatus.STATUS_STARTING_NODE);
-
-        Node node = Client.start_node(myPort, bs, bsPort, true);
-
-
+
+
+
+
+
-        
-        Access.SocketRule[] accessRuleArray = null;
@@ -1335 +1309 @@
-            reporting, reaping);
-
-
+
+
-    }
-

feedtree/trunk/src/net/feedtree/proxyapp/gui/AppControl.java

@@ -31 +31 @@
-    
-    public AppGUI gui;
-WebProxy
+
-    public Preferences prefs;
-    public JDialog dlg;
@@ -64 +64 @@
-    public AppControl(AppGUI gui) {
-        this.gui = gui;
-new WebProxyClient.C
+Client.c
-    }
-
@@ -171 +171 @@
-    }
-
-    public void restart() {
-        // Highly experimental!
-        //
-        /* 
-        ((rice.pastry.PastryNode)(WebProxyClient.global.getNode())).destroy();
-        WebProxyClient.global = null;
-
-        status.notifyStatus(WebProxyClient.ClientStatus.STATUS_NOT_STARTED);
-        
-        try {
-            Thread.sleep(1000);
-        } catch (java.lang.InterruptedException exc) { }
-        
-        run();
-        */
-
-        System.exit(0);
-    }
-
-    public void run() {
-        prefs = Preferences.userRoot().node(PREFS_NODE_NAME);
-
-
+
+
+
-
-        int myPort = prefs.getInt(PR_PASTRY_PORT, Client.PASTRY_PORT);
@@ -276 +259 @@
-
-        // Start the node
-        status.notifyStatus(WebProxyClient.ClientStatus.STATUS_STARTING_NODE);
-
-        Node node = Client.start_node(myPort, bs, bsPort, true);
-        
-
+
+
+
-        
-        Access.SocketRule[] accessRuleArray = null;
@@ -295 +278 @@
-            reporting, reaping);
-
-
+
+
+
-    }
-}

feedtree/trunk/src/net/feedtree/proxyapp/gui/AppGUI.java

@@ -8 +8 @@
-
-import net.feedtree.proxyapp.*;
+import net.feedtree.core.client.*;
-
-import javax.swing.*;
@@ -104 +105 @@
-
-    public void update(Observable obj, Object arg) {
+        boolean stopProgress = false;
+
-        int status = ((Integer)arg).intValue();
-
-
-
-
-
+
+
+
+
-        } else if (status >= 0) {
-            progressBar.setValue(progressBar.getValue() + 1);
-        }
-
-        boolean stopProgress = false;
-        String msg = "";
-        switch (status) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                break;
-        }
@@ -161 +174 @@
-            int port = client.getProxyPort();
-            
-            /*
-             * This logic is totally faulty!  This will give
-             * us the *external* address, and it's entirely likely
-             * that the port for the HTTP proxy isn't forwarded from that
-             * external address (only port 29690).
-             *
-            InetSocketAddress addr = client.getLocalNodeAddress();
-            if (addr != null) {
-                hostname = addr.getHostName();
-            } else {
-                hostname = "localhost";
-            }
-            */
-            try {
-                hostname = InetAddress.getLocalHost().getHostName();