Proper handling of org.chromium.flimflam.Error.InProgress, dbus exception

server/site_wlan_connect.py

 import dbus, dbus.mainloop.glib, gobject, logging, re, sys, time, subprocess
 
 ssid           = sys.argv[1]
 security       = sys.argv[2]
 psk            = sys.argv[3]
 assoc_timeout  = float(sys.argv[4])
 config_timeout = float(sys.argv[5])
 reset_timeout  = float(sys.argv[6]) if len(sys.argv) > 6 else assoc_timeout
 
 bus_loop = dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
@@ skipping 15 matching lines @@
             "org.chromium.flimflam.Service")
     except Exception, e:
         print "FAIL(GetService): ssid %s exception %s" %(ssid, e)
         sys.exit(1)
 
     return (path, service)
 
 
 def ParseProps(props):
     proplist = []
-    for p in props:
-        proplist.append("'%s': '%s'" % (str(p), str(props[p])))
-    return '{ %s }' % ', '.join(proplist)
+    if props is not None:
+        for p in props:
+            proplist.append("'%s': '%s'" % (str(p), str(props[p])))
+        return '{ %s }' % ', '.join(proplist)
+    else:
+        return 'None'
 
 
 def ResetService(init_state):
     wait_time = 0
 
     if init_state == 'idle':
         # If we are already idle, we have nothing to do
         return
     if init_state == 'ready':
         # flimflam is already connected.  Disconnect.
@@ skipping 29 matching lines @@
         connect_quirks['lost_dbus'] = 1
         print>>sys.stderr, "We just lost the service handle!"
         return (None, 'DBUSFAIL')
 
     ResetService(init_state)
 
     # print "INIT_STATUS1: %s" % service.GetProperties().get("State", None)
 
     try:
         service.Connect()
-    except org.chromium.flimflam.Error.InProgress, e:
-        # We can hope that a ResetService in the next call will solve this
-        connect_quirks['in_progress'] = 1
-        print>>sys.stderr, "Previous connect is still in progress!"
-        time.sleep(.5)
-        return (None, 'FAIL')
+    except dbus.exceptions.DBusException, e:
+        if e.get_dbus_name() ==  'org.chromium.flimflam.Error.InProgress':
+            # We can hope that a ResetService in the next call will solve this
+            connect_quirks['in_progress'] = 1
+            print>>sys.stderr, "Previous connect is still in progress!"
+            time.sleep(5)

[Sam Leffler, 2010/06/11 22:11:01]

These arbitrary sleeps will skew results.  But I guess they're ok for now while
we fix the root cause of the problem(s).

+            return (None, 'FAIL')
+        # What is this exception?
+        print "FAIL(Connect): ssid %s DBus exception %s" %(ssid, e)
+        sys.exit(2)
     except Exception, e:
         print "FAIL(Connect): ssid %s exception %s" %(ssid, e)
         sys.exit(2)
 
     properties = None
     # wait up to assoc_timeout seconds to associate
     while assoc_time < assoc_timeout:
         properties = service.GetProperties()
         status = properties.get("State", None)
         #    print>>sys.stderr, "time %3.1f state %s" % (assoc_time, status)
@@ skipping 87 matching lines @@
     if config_time >= config_timeout:
         print "TIMEOUT(config): ssid %s assoc %3.1f config %3.1f secs" \
             %(ssid, assoc_time, config_time)
         DumpLogs(logs)
         sys.exit(6)
 
 print "OK %3.1f %3.1f %s (assoc and config times in sec, quirks)" \
     %(assoc_time, config_time, str(connect_quirks.keys()))
 sys.exit(0)