Add a helper to translate a log level to a tier

This is in utils for now - we'll find a better home down the track.
This commit is contained in:
Aldo Cortesi 2016-07-16 10:33:50 +12:00
parent 91e9016ce5
commit 49b65d2ea4
3 changed files with 8 additions and 4 deletions

View File

@ -22,6 +22,7 @@ from mitmproxy import controller
from mitmproxy import exceptions
from mitmproxy import flow
from mitmproxy import script
from mitmproxy import utils
from mitmproxy.console import flowlist
from mitmproxy.console import flowview
from mitmproxy.console import grideditor
@ -271,8 +272,7 @@ class ConsoleMaster(flow.FlowMaster):
return super(ConsoleMaster, self).load_script(command, use_reloader)
def sig_add_log(self, sender, e, level):
needed = dict(error=0, warn=1, info=2, debug=3).get(level, 2)
if self.options.verbosity < needed:
if self.options.verbosity < utils.log_tier(level):
return
if level == "error":

View File

@ -15,6 +15,7 @@ from mitmproxy import exceptions
from mitmproxy import filt
from mitmproxy import flow
from mitmproxy import builtins
from mitmproxy import utils
from netlib import human
from netlib import tcp
from netlib import strutils
@ -114,8 +115,7 @@ class DumpMaster(flow.FlowMaster):
raise DumpError(str(e))
def add_log(self, e, level="info"):
needed = dict(error=0, warn=1, info=2, debug=3).get(level, 2)
if self.options.verbosity >= needed:
if self.options.verbosity >= utils.log_tier(level):
self.echo(
e,
fg="red" if level == "error" else None,

View File

@ -36,3 +36,7 @@ class LRUCache:
d = self.cacheList.pop()
self.cache.pop(d)
return ret
def log_tier(level):
return dict(error=0, warn=1, info=2, debug=3).get(level)