From b5470367a74fb09fb30dc56fe6a22254fe25d18e Mon Sep 17 00:00:00 2001
From: Ruben Pollan <meskio@sindominio.net>
Date: Thu, 29 Jun 2017 13:06:19 +0200
Subject: [bug] don't raise exceptions stoping the VPN service

Let's also catch the exceptions raised by stopping services so bitmaskd can
stop.
---
 src/leap/bitmask/vpn/service.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/leap/bitmask/vpn/service.py')

diff --git a/src/leap/bitmask/vpn/service.py b/src/leap/bitmask/vpn/service.py
index 343a2d35..70c26248 100644
--- a/src/leap/bitmask/vpn/service.py
+++ b/src/leap/bitmask/vpn/service.py
@@ -67,7 +67,10 @@ class VPNService(HookableService):
         super(VPNService, self).startService()
 
     def stopService(self):
-        self.stop_vpn()
+        try:
+            self.stop_vpn()
+        except Exception as e:
+            self.log.error('Error stopping vpn service... {0!r}'.format(e))
         super(VPNService, self).stopService()
 
     @defer.inlineCallbacks
-- 
cgit v1.2.3