Change log: https://roxy-wi.org/changelog.py#6_1_2
pull/334/head
Pavel Loginov 2022-07-24 23:40:44 +03:00
parent 6ae69306c2
commit bb6d6c18f7
1 changed files with 3 additions and 4 deletions

View File

@ -1264,22 +1264,21 @@ def show_finding_in_config(stdout: str, **kwargs) -> str:
def show_haproxy_log(serv, rows=10, waf='0', grep=None, hour='00', minut='00', hour1='24', minut1='00', service='haproxy', **kwargs): def show_haproxy_log(serv, rows=10, waf='0', grep=None, hour='00', minut='00', hour1='24', minut1='00', service='haproxy', **kwargs):
import sql import sql
exgrep = checkAjaxInput(form.getvalue('exgrep')) exgrep = form.getvalue('exgrep')
log_file = checkAjaxInput(form.getvalue('file')) log_file = checkAjaxInput(form.getvalue('file'))
date = checkAjaxInput(hour) + ':' + checkAjaxInput(minut) date = checkAjaxInput(hour) + ':' + checkAjaxInput(minut)
date1 = checkAjaxInput(hour1) + ':' + checkAjaxInput(minut1) date1 = checkAjaxInput(hour1) + ':' + checkAjaxInput(minut1)
grep = checkAjaxInput(grep)
rows = checkAjaxInput(rows) rows = checkAjaxInput(rows)
waf = checkAjaxInput(waf) waf = checkAjaxInput(waf)
cmd = '' cmd = ''
if grep is not None: if grep is not None:
grep_act = '|egrep "%s"' % grep grep_act = '|egrep "%s"' % checkAjaxInput(grep)
else: else:
grep_act = '' grep_act = ''
if exgrep is not None: if exgrep is not None:
exgrep_act = '|egrep -v "%s"' % exgrep exgrep_act = '|egrep -v "%s"' % checkAjaxInput(exgrep)
else: else:
exgrep_act = '' exgrep_act = ''