diff options
| author | Kali Kaneko <kali@leap.se> | 2014-05-07 17:24:12 -0500 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2014-05-12 11:25:26 -0500 |
| commit | d68e35c611638a57bbda99665f9685e5ae6fcd23 (patch) | |
| tree | c0b561967402d5074b4a72f38ddf5dd3c921e6ba /src/leap/bitmask | |
| parent | fddc47368fba6a65e33b14ec8d1a11a755c5f0ab (diff) | |
introduce delay on shutdown after resolvconf was daemonized
Diffstat (limited to 'src/leap/bitmask')
| -rw-r--r-- | src/leap/bitmask/gui/mainwindow.py | 9 | ||||
| -rw-r--r-- | src/leap/bitmask/services/eip/vpnlauncher.py | 1 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py index 70fad204..681432b3 100644 --- a/src/leap/bitmask/gui/mainwindow.py +++ b/src/leap/bitmask/gui/mainwindow.py @@ -2068,9 +2068,12 @@ class MainWindow(QtGui.QMainWindow): logger.debug('Terminating vpn') self._backend.stop_eip(shutdown=True) - # XXX this *has* to block, since we have some delay in vpn.terminate - # it should receive a signal from backend that everything is clear to - # proceed, or timeout happened. + # XXX this *has* to wait for a reasonable lapse, since we have some + # delay in vpn.terminate. + # For a better solution it should receive be + # signaled from backend that + # everything is clear to proceed, or timeout happened. + time.sleep(1.5) self._cancel_ongoing_defers() diff --git a/src/leap/bitmask/services/eip/vpnlauncher.py b/src/leap/bitmask/services/eip/vpnlauncher.py index ed49ba59..dc72f276 100644 --- a/src/leap/bitmask/services/eip/vpnlauncher.py +++ b/src/leap/bitmask/services/eip/vpnlauncher.py @@ -127,7 +127,6 @@ class VPNLauncher(object): if gateway_conf == leap_settings.GATEWAY_AUTOMATIC: gateway_selector = VPNGatewaySelector(eipconfig) - print "auto: getting from selector" gateways = gateway_selector.get_gateways() else: gateways = [gateway_conf] |