diff options
| author | Kali Kaneko <kali@leap.se> | 2014-05-21 18:42:05 -0500 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2014-05-29 10:22:44 -0500 |
| commit | ccc8973bdc5cc0858906751eada622de74fd5d37 (patch) | |
| tree | 06c40ef1e3ed8200aa67e5fa6692a937d9fc8458 /src/leap/bitmask/backend.py | |
| parent | 7b7e1357fc1e9e64e7c2ee08f762389d7128efc3 (diff) | |
refactor eip start/stop control to conductor
and cleanup a little bit of the signal mess.
Diffstat (limited to 'src/leap/bitmask/backend.py')
| -rw-r--r-- | src/leap/bitmask/backend.py | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/leap/bitmask/backend.py b/src/leap/bitmask/backend.py index 5e22a8c4..f0fe50f9 100644 --- a/src/leap/bitmask/backend.py +++ b/src/leap/bitmask/backend.py @@ -434,8 +434,12 @@ class EIP(object): except Exception as e: logger.error("Unexpected problem: {0!r}".format(e)) else: + logger.debug('EIP: no errors') # TODO: are we connected here? - signaler.signal(signaler.EIP_CONNECTED) + # kali -- no, we are not! CONNECTED should be passed only + # by the vpn observer. Currently handled by the state updater + # in eip_status + #signaler.signal(signaler.EIP_CONNECTED) def _do_stop(self, shutdown=False, restart=False): """ @@ -470,9 +474,9 @@ class EIP(object): self._signaler.signal(self._signaler.EIP_STOPPED) return else: - msg = "Firewall is not down yet, waiting... {0} of {1}" - msg = msg.format(retry, MAX_FW_WAIT_RETRIES) - logger.debug(msg) + #msg = "Firewall is not down yet, waiting... {0} of {1}" + #msg = msg.format(retry, MAX_FW_WAIT_RETRIES) + #logger.debug(msg) time.sleep(FW_WAIT_STEP) retry += 1 logger.warning("After waiting, firewall is not down... " |