summaryrefslogtreecommitdiff
path: root/src/leap
diff options
context:
space:
mode:
authorIvan Alejandro <ivanalejandro0@gmail.com>2014-09-01 18:31:36 -0300
committerIvan Alejandro <ivanalejandro0@gmail.com>2014-09-03 15:00:50 -0300
commit4f4520d938f726b344e1a71949f83aa385d92acd (patch)
tree56006a8e0e9722e636169a0cd0d878bc9dbc9a9c /src/leap
parentb3a7454bdfa512663b4f79884e421ee990f74428 (diff)
Don't defer action to thread here.
We already are running the methods in a thread from the backend.
Diffstat (limited to 'src/leap')
-rw-r--r--src/leap/bitmask/backend/components.py10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/leap/bitmask/backend/components.py b/src/leap/bitmask/backend/components.py
index 89f3c5a6..d4f6d176 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.