From 38871c56726b32126c7838ff8e4dbf1222082a15 Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Wed, 23 Aug 2017 00:44:22 -0400
Subject: [feature] allow integer for management verbosity

---
 src/leap/bitmask/vpn/management.py | 8 ++++----
 src/leap/bitmask/vpn/process.py    | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'src/leap/bitmask')

diff --git a/src/leap/bitmask/vpn/management.py b/src/leap/bitmask/vpn/management.py
index 1994e0b..4aa0e00 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 4ef9fd9..5d23a0a 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)
 
-- 
cgit v1.2.3