Merge pull request #2194 from matthewrmshin/fix-gscan-update-issues

gscan: improve diag while updating
cylc · Mar 8, 2017 · 0c163c6 · 0c163c6
2 parents 35136a5 + f72cde3
commit 0c163c6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/lib/cylc/gui/gscan.py b/lib/cylc/gui/gscan.py
@@ -195,7 +195,7 @@ def __init__(
                     raise ValueError("Invalid %s pattern: %s" % (label, items))
 
         self.updater = ScanAppUpdater(
-            self.hosts, suite_treemodel, self.suite_treeview,
+            self.window, self.hosts, suite_treemodel, self.suite_treeview,
             comms_timeout=comms_timeout, poll_interval=poll_interval,
             group_column_id=self.GROUP_COLUMN,
             name_pattern=patterns["name"], owner_pattern=patterns["owner"])
@@ -541,9 +541,10 @@ class ScanAppUpdater(threading.Thread):
 
     POLL_INTERVAL = 60
 
-    def __init__(self, hosts, suite_treemodel, suite_treeview,
+    def __init__(self, window, hosts, suite_treemodel, suite_treeview,
                  comms_timeout=None, poll_interval=None, group_column_id=0,
                  name_pattern=None, owner_pattern=None):
+        self.window = window
         self.hosts = hosts
         self.comms_timeout = comms_timeout
         if poll_interval is None:
@@ -665,10 +666,13 @@ def run(self):
                 continue
             if self._should_force_update:
                 self._should_force_update = False
+            title = self.window.get_title()
+            gobject.idle_add(self.window.set_title, title + " (updating)")
             self.suite_info_map = update_suites_info(
                 self.hosts, self.comms_timeout, self.owner_pattern,
                 self.name_pattern, self.suite_info_map)
             self.last_update_time = time.time()
+            gobject.idle_add(self.window.set_title, title)
             gobject.idle_add(self.update)
             time.sleep(1)
 

diff --git a/lib/cylc/network/https/port_scan.py b/lib/cylc/network/https/port_scan.py
@@ -60,7 +60,7 @@ def _scan1_impl(conn, timeout, my_uuid):
             result = client.identify()
         except ConnectionTimeout as exc:
             conn.send((host, port, MSG_TIMEOUT))
-        except ConnectionError as exc:
+        except (ConnectionError, SuiteStillInitialisingError) as exc:
             conn.send((host, port, None))
         else:
             owner = result.get('owner')
@@ -84,6 +84,11 @@ def _scan1_impl(conn, timeout, my_uuid):
                             my_uuid=my_uuid, timeout=timeout)
                         try:
                             result = client.identify()
+                        except SuiteStillInitialisingError as exc:
+                            if cylc.flags.debug:
+                                print >> sys.stderr, (
+                                    '    (connected with passphrase,' +
+                                    ' suite initialising)')
                         except ConnectionError as exc:
                             # Nope (private suite, wrong passphrase).
                             if cylc.flags.debug: