Merge lp:~lifeless/txaws/client into lp:~txawsteam/txaws/trunk

[Robert Collins]

[Robert Collins (lifeless)]

Fix a bug with timeouts causing the gtk client to crash.

[lp:~lifeless/txaws/client]

5. By Robert Collins on 2009-05-08

Handle timeout errors in the gtk gui.

=== modified file 'txaws/client/gui/gtk.py'
--- txaws/client/gui/gtk.py	2009-04-30 13:49:08 +0000
+++ txaws/client/gui/gtk.py	2009-05-06 14:28:00 +0000
@@ -108,7 +108,7 @@
             # credentials.
             return
         self.probing = True
-        self.client.describe_instances().addCallbacks(self.showhide, self.errorit)
+        self.client.describe_instances().addCallbacks(self.showhide, self.describe_error)
 
     def on_popup_menu(self, status, button, time):
         self.menu.popup(None, None, None, button, time)
@@ -116,7 +116,7 @@
     def on_stop_instances(self, data):
         # It would be nice to popup a window to select instances.. TODO.
         self.client.describe_instances().addCallbacks(self.shutdown_instances,
-            self.errorit)
+            self.show_error)
 
     def save_key(self, response_id, data):
         # handle the dialog
@@ -153,15 +153,28 @@
     def shutdown_instances(self, reservation):
         d = self.client.terminate_instances(
             *[instance.instanceId for instance in reservation])
-        d.addCallbacks(self.on_activate, self.errorit)
+        d.addCallbacks(self.on_activate, self.show_error)
 
     def queue_check(self):
         self.probing = False
         self.reactor.callLater(60, self.on_activate, None)
 
-    def errorit(self, error):
+    def show_error(self, error):
         # debugging output for now.
-        print error.value, error.value.response
+        print error.value
+        try:
+            print error.value.response
+        except:
+            pass
+
+    def describe_error(self, error):
+        if isinstance(error.value, twisted.internet.defer.TimeoutError):
+            # timeout errors can be ignored - transient network issue or some
+            # such.
+            pass
+        else:
+            # debugging output for now.
+            self.show_error(error)
         self.queue_check()