Backed out changeset 25a1c4b0e2af (bug 1439411) for linting failure. a= backout on a CLOSED TREE

This commit is contained in:
Ciure Andrei 2018-02-20 13:45:08 +02:00
parent 4f6234b136
commit 040171056c

View File

@ -15,18 +15,12 @@ from . import formatters
from .structuredlog import StructuredLogger, set_default_logger
log_formatters = {
'raw': (formatters.JSONFormatter, "Raw structured log messages "
"(provided by mozlog)"),
'unittest': (formatters.UnittestFormatter, "Unittest style output "
"(provided by mozlog)"),
'xunit': (formatters.XUnitFormatter, "xUnit compatible XML "
"(povided by mozlog)"),
'html': (formatters.HTMLFormatter, "HTML report "
"(provided by mozlog)"),
'mach': (formatters.MachFormatter, "Human-readable output "
"(provided by mozlog)"),
'tbpl': (formatters.TbplFormatter, "TBPL style log format "
"(provided by mozlog)"),
'raw': (formatters.JSONFormatter, "Raw structured log messages"),
'unittest': (formatters.UnittestFormatter, "Unittest style output"),
'xunit': (formatters.XUnitFormatter, "xUnit compatible XML"),
'html': (formatters.HTMLFormatter, "HTML report"),
'mach': (formatters.MachFormatter, "Human-readable output"),
'tbpl': (formatters.TbplFormatter, "TBPL style log format"),
'errorsummary': (formatters.ErrorSummaryFormatter, argparse.SUPPRESS),
}
@ -34,9 +28,6 @@ TEXT_FORMATTERS = ('raw', 'mach')
"""a subset of formatters for non test harnesses related applications"""
DOCS_URL = "https://firefox-source-docs.mozilla.org/mozbase/mozlog.html"
def level_filter_wrapper(formatter, level):
return handlers.LogLevelFilter(formatter, level)
@ -130,10 +121,7 @@ def add_logging_group(parser, include_formatters=None):
group_name = "Output Logging"
group_description = ("Each option represents a possible logging format "
"and takes a filename to write that format to, "
"or '-' to write to stdout. Some options are "
"provided by the mozlog utility; see %s "
"for extended documentation." % DOCS_URL)
"or '-' to write to stdout.")
if include_formatters is None:
include_formatters = list(log_formatters.keys())