Changeset 878

Timestamp:

02/11/14 22:16:48 (10 years ago)

Author:

jts21

Message:

Make FrameShare attempt to continue after (previously) uncaught exceptions (just means that if it can't find a file or gets a null pointer exception but is still in a working state then it'll keep going rather than having to be restarted)

Location:

trunk/src/org/expeditee/network

Files:

• DefaultServer.java (modified) (1 diff)
• FrameShare.java (modified) (3 diffs)
• ImageSaver.java (modified) (1 diff)
• ImageServer.java (modified) (1 diff)

trunk/src/org/expeditee/network/DefaultServer.java

@@ -58 +58 @@
                 //MessageBay.displayMessage(this.getName() + " started on port "
                 //              + socket.getLocalPort());
+                int fail = 0;
 
                 while (!_stop) {
                         try {
                                 listenForMessages();
-        
+                                fail = 0;
                         } catch (IOException e) {
                                 e.printStackTrace();
+                        } catch (Exception e) {
+                                /**
+                                 * If we hit an Exception we don't want to crash,
+                                 * but we also don't want to get into an infinite loop of ignoring fatal exceptions.
+                                 * so try again but count the failures to make sure we don't get into an infinite loop.
+                                 * (don't just use a boolean because the next message we parse could also cause another
+                                 *  non-fatal exception, and we don't want to exit unless absolutely necessary)
+                                 */
+                                e.printStackTrace();
+                                if(fail > 10) {
+                                        System.out.println("*****\nIt appears that we've failed to continue from an uncaught exception\n*****");
+                                        // close all the servers
+                                        FrameShare.getInstance().finalise();
+                                        // attempt to restart
+                                        // (don't do this yet since there's currently no way to know if the restart fails,
+                                        //  so we could get stuck in a loop) 
+                                        // FrameShare.restart();
+                                        
+                                        // if we're only running the frameshare server, exit
+                                        if(FrameShare.isHeadless()) {
+                                                System.exit(1);
+                                        }
+                                } else {
+                                        fail++;
+                                        System.out.println("*****\nEncountered an uncaught exception, attempting to continue\n*****");
+                                }
                         }
                 }
+                
+                closeSocket();
+        }
+        
+        protected void closeSocket() {
                 socket.close();
         }

trunk/src/org/expeditee/network/FrameShare.java

@@ -43 +43 @@
 
         private static FrameShare _theSession;
+        
+        private static boolean headless = false;
 
         private Map<String, Peer> _peers;
@@ -511 +513 @@
                 }
         }
+        
+        public static void restart() {
+                if(_theSession != null) {
+                        _theSession.finalise();
+                        _theSession = new FrameShare(_theSession._port);
+                }
+        }
+        
+        public static boolean isHeadless() {
+                return headless;
+        }
 
 
@@ -535 +548 @@
             
             String port_str = args[0];
+            
+            FrameShare.headless = true;
 
             try {

trunk/src/org/expeditee/network/ImageSaver.java

@@ -113 +113 @@
         
         @Override
-        public void run() {
-                //MessageBay.displayMessage(this.getName() + " started on port "
-                //              + socket.getLocalPort());
-
-                while (!_stop) {
-                        try {
-                                listenForMessages();
-        
-                        } catch (IOException e) {
-                                e.printStackTrace();
-                        }
+        protected void closeSocket() {
+                try {
+                        socket.close();
+                } catch (IOException e) {
+                        e.printStackTrace();
                 }
-                try {
-                socket.close();
-        } catch (IOException e) {
-                e.printStackTrace();
-        }
         }
-
 }

trunk/src/org/expeditee/network/ImageServer.java

@@ -91 +91 @@
         
         @Override
-        public void run() {
-                //MessageBay.displayMessage(this.getName() + " started on port "
-                //              + socket.getLocalPort());
-
-                while (!_stop) {
-                        try {
-                                listenForMessages();
-        
-                        } catch (IOException e) {
-                                e.printStackTrace();
-                        }
+        protected void closeSocket() {
+                try {
+                        socket.close();
+                } catch (IOException e) {
+                        e.printStackTrace();
                 }
-                try {
-                socket.close();
-        } catch (IOException e) {
-                e.printStackTrace();
-        }
         }