summaryrefslogtreecommitdiff
path: root/src/leap/bitmask
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2017-08-23 00:44:22 -0400
committerKali Kaneko <kali@leap.se>2017-08-30 16:18:02 -0400
commit38871c56726b32126c7838ff8e4dbf1222082a15 (patch)
tree396c654260c70dfb2328e155e2808c34f1087de8 /src/leap/bitmask
parentb314c73432da0797fc00e7a6d270b783929d4c08 (diff)
[feature] allow integer for management verbosity
Diffstat (limited to 'src/leap/bitmask')
-rw-r--r--src/leap/bitmask/vpn/management.py8
-rw-r--r--src/leap/bitmask/vpn/process.py3
2 files changed, 6 insertions, 5 deletions
diff --git a/src/leap/bitmask/vpn/management.py b/src/leap/bitmask/vpn/management.py
index 1994e0bf..4aa0e000 100644
--- a/src/leap/bitmask/vpn/management.py
+++ b/src/leap/bitmask/vpn/management.py
@@ -67,10 +67,10 @@ class ManagementProtocol(LineReceiver):
def lineReceived(self, line):
if self.verbose:
- # TODO get an integer parameter instead
- # TODO if very verbose, print everything
- # if less verbose, print (log) only the "DEBUG" lines.
- print line
+ if int(self.verbose) > 1:
+ print line
+ elif line.startswith('>LOG'):
+ print line
if line[0] == '>':
try:
diff --git a/src/leap/bitmask/vpn/process.py b/src/leap/bitmask/vpn/process.py
index 4ef9fd98..5d23a0af 100644
--- a/src/leap/bitmask/vpn/process.py
+++ b/src/leap/bitmask/vpn/process.py
@@ -116,7 +116,8 @@ class _VPNProcess(protocol.ProcessProtocol):
def retry(retries):
ctr = retries - 1
self.log.warn(
- 'Error connecting to management, retrying. Retries left: %s' % ctr)
+ 'Error connecting to management, retrying. '
+ 'Retries left: %s' % ctr)
reactor.callLater(
0.1, self._connect_to_management, ctr)