Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Quiet Mode #181

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Quiet Mode #181

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c2326ac
add quiet mode; split output
ldv8434 May 6, 2022
a0a763f
change "fail" logger level back to err
ldv8434 May 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions patator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -799,7 +799,7 @@ def filter(self, record):
else:
return 1

def process_logs(queue, indicatorsfmt, argv, log_dir, runtime_file, csv_file, xml_file, hits_file):
def process_logs(queue, indicatorsfmt, argv, log_dir, runtime_file, csv_file, xml_file, hits_file, quiet):

ignore_ctrlc()

Expand All @@ -810,12 +810,26 @@ def process_logs(queue, indicatorsfmt, argv, log_dir, runtime_file, csv_file, xm
logging._levelNames[logging.ERROR] = 'FAIL'
encoding = None

handler_out = logging.StreamHandler()
# handler for DEBUG, INFO, and WARNING, level
handler_out = logging.StreamHandler(sys.stdout)
handler_out.setFormatter(TXTFormatter(indicatorsfmt))
if quiet:
# filter out anything going to stdout
handler_out.addFilter(lambda record: record.levelno <= -1)
else:
# filter to only ERROR or lower to stdout
handler_out.addFilter(lambda record: record.levelno <= logging.ERROR)

# handler for CRITICAL error
handler_err = logging.StreamHandler(sys.stderr)
handler_err.setFormatter(TXTFormatter(indicatorsfmt))
handler_err.setLevel(logging.CRITICAL)


logger = logging.getLogger('patator')
logger.setLevel(logging.DEBUG)
logger.addHandler(handler_out)
logger.addHandler(handler_err)

names = [name for name, _ in indicatorsfmt] + ['candidate', 'num', 'mesg']

Expand Down Expand Up @@ -1536,6 +1550,7 @@ def format_usage(self, usage):
opt_grp.add_option('--groups', dest='groups', default='', metavar='', help="default is to iterate over the cartesian product of all payload sets, use this option to iterate over sets simultaneously instead (aka pitchfork), see syntax inside (default is '0,1..n')")

log_grp = OptionGroup(parser, 'Logging')
log_grp.add_option('-q', dest='quiet', action='store_true', default=False, help="suppress non-critical-error output")
log_grp.add_option('-l', dest='log_dir', metavar='DIR', help="save output and response data into DIR ")
log_grp.add_option('-L', dest='auto_log', metavar='SFX', help="automatically save into DIR/yyyy-mm-dd/hh:mm:ss_SFX (DIR defaults to '/tmp/patator')")
log_grp.add_option('-R', dest='runtime_file', metavar='FILE', help="save output to FILE")
Expand Down Expand Up @@ -1602,7 +1617,7 @@ def __init__(self, module, argv):

log_queue = multiprocessing.Queue()

logsvc = multiprocessing.Process(name='LogSvc', target=process_logs, args=(log_queue, module.Response.indicatorsfmt, argv, build_logdir(opts.log_dir, opts.auto_log, opts.assume_yes), opts.runtime_file, opts.csv_file, opts.xml_file, opts.hits_file))
logsvc = multiprocessing.Process(name='LogSvc', target=process_logs, args=(log_queue, module.Response.indicatorsfmt, argv, build_logdir(opts.log_dir, opts.auto_log, opts.assume_yes), opts.runtime_file, opts.csv_file, opts.xml_file, opts.hits_file, opts.quiet))
logsvc.daemon = True
logsvc.start()

Expand Down