From f0988aaae940f0eaa13cda941cf5de7978c74297 Mon Sep 17 00:00:00 2001
From: Ruben Pollan <meskio@sindominio.net>
Date: Wed, 14 Jun 2017 19:34:22 +0200
Subject: [bug] only start the child services if they are not running

- Resolves: #8921
---
 src/leap/bitmask/core/dispatcher.py | 1 -
 src/leap/bitmask/core/service.py    | 5 ++---
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/leap/bitmask/core')

diff --git a/src/leap/bitmask/core/dispatcher.py b/src/leap/bitmask/core/dispatcher.py
index ba000d43..e0cc1297 100644
--- a/src/leap/bitmask/core/dispatcher.py
+++ b/src/leap/bitmask/core/dispatcher.py
@@ -247,7 +247,6 @@ class MailCmd(SubCommand):
 
     @register_method('dict')
     def do_ENABLE(self, service, *parts, **kw):
-        # FIXME -- service doesn't have this method
         d = service.do_enable_service(self.label)
         return d
 
diff --git a/src/leap/bitmask/core/service.py b/src/leap/bitmask/core/service.py
index 0a3ac6bd..9ff599e3 100644
--- a/src/leap/bitmask/core/service.py
+++ b/src/leap/bitmask/core/service.py
@@ -17,7 +17,6 @@
 """
 Bitmask-core Service.
 """
-import json
 import os
 import uuid
 try:
@@ -145,9 +144,9 @@ class BitmaskBackend(configurable.ConfigurableService):
         sessions.setServiceParent(self)
 
     def _start_child_service(self, name):
-        log.debug('Starting backend child service: %s' % name)
         service = self.getServiceNamed(name)
-        if service:
+        if service and not service.running:
+            log.debug('Starting backend child service: %s' % name)
             service.startService()
 
     def _stop_child_service(self, name):
-- 
cgit v1.2.3