summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/backend
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2014-09-26 10:15:06 -0300
committerTomás Touceda <chiiph@leap.se>2014-09-26 10:15:06 -0300
commit6f7177f3ca359f8c3e74d094b0dcd0f9239fb069 (patch)
treef04b0eb5c4665a129c5c49719b2da65d325b111f /src/leap/bitmask/backend
parente8c028f3eb6cd0681f039c456dc1ac45c98d598f (diff)
parent0db3d5a4aecc0a3c271b92c6187922c50d46df0a (diff)
Merge branch 'release-0.7.0'0.7.0rc20.7.0rc1
Diffstat (limited to 'src/leap/bitmask/backend')
-rw-r--r--src/leap/bitmask/backend/components.py12
1 files changed, 3 insertions, 9 deletions
diff --git a/src/leap/bitmask/backend/components.py b/src/leap/bitmask/backend/components.py
index f721086b..5ef6befd 100644
--- a/src/leap/bitmask/backend/components.py
+++ b/src/leap/bitmask/backend/components.py
@@ -452,20 +452,14 @@ class EIP(object):
else:
logger.debug('EIP: no errors')
- def _do_stop(self, shutdown=False, restart=False):
+ def stop(self, shutdown=False, restart=False):
"""
- Stop the service. This is run in a thread to avoid blocking.
+ Stop the service.
"""
self._vpn.terminate(shutdown, restart)
if IS_LINUX:
self._wait_for_firewall_down()
- def stop(self, shutdown=False, restart=False):
- """
- Stop the service.
- """
- return threads.deferToThread(self._do_stop, shutdown, restart)
-
def _wait_for_firewall_down(self):
"""
Wait for the firewall to come down.
@@ -665,7 +659,7 @@ class EIP(object):
return False
client_cert_path = eip_config.\
- get_client_cert_path(provider_config, about_to_download=False)
+ get_client_cert_path(provider_config, about_to_download=True)
if leap_certs.should_redownload(client_cert_path):
logger.error("The client should redownload the certificate,"